clawmatrix 0.1.23 → 0.2.1

package/src/types.ts

@@ -12,11 +12,33 @@ export interface ClusterFrame {
 // ── Auth messages ──────────────────────────────────────────────────
 export interface AuthChallenge extends ClusterFrame {
   type: "auth_challenge";
-  payload: { nonce: string };
+  payload: { nonce: string; publicKey?: string };
 }
 
+/** Legacy plaintext auth (used when E2EE is disabled). */
 export interface AuthRequest extends ClusterFrame {
   type: "auth";
+  payload: {
+    nodeId: string;
+    sig: string;
+    publicKey?: string;
+    agents?: AgentInfo[];
+    models?: ModelInfo[];
+    tags?: string[];
+    deviceInfo?: DeviceInfo;
+    toolProxy?: ToolProxyInfo;
+  };
+}
+
+/** Phase 2 of E2EE handshake: client sends its public key (plaintext). */
+export interface AuthKeyExchange extends ClusterFrame {
+  type: "auth_key_exchange";
+  payload: { publicKey: string };
+}
+
+/** Phase 3 of E2EE handshake: client sends encrypted HMAC + capabilities. */
+export interface AuthVerify extends ClusterFrame {
+  type: "auth_verify";
   payload: {
     nodeId: string;
     sig: string;
@@ -115,6 +137,8 @@ export interface ModelResponse extends ClusterFrame {
   payload: {
     success: boolean;
     content?: string;
+    /** Reasoning/thinking content from models like DeepSeek. */
+    reasoning?: string;
     /** Full message object from upstream (choices[0].message or responses output).
      *  Carries tool_calls, refusal, etc. that `content` alone cannot represent. */
     message?: unknown;
@@ -128,6 +152,8 @@ export interface ModelStreamChunk extends ClusterFrame {
   id: string;
   payload: {
     delta: string;
+    /** Reasoning/thinking delta from models like DeepSeek (reasoning_content). */
+    reasoningDelta?: string;
     /** Full delta object from upstream (choices[0].delta).
      *  Carries tool_calls chunks that `delta` string cannot represent. */
     deltaObj?: unknown;
@@ -136,6 +162,14 @@ export interface ModelStreamChunk extends ClusterFrame {
   };
 }
 
+// ── Image content ─────────────────────────────────────────────────
+export interface ImageContent {
+  /** Base64-encoded image data (without data URI prefix) */
+  data: string;
+  /** MIME type, e.g. "image/png", "image/jpeg" */
+  mediaType: string;
+}
+
 // ── Handoff ────────────────────────────────────────────────────────
 export type HandoffStatus = "working" | "input_required" | "completed" | "failed" | "canceled";
 
@@ -152,6 +186,8 @@ export interface HandoffRequest extends ClusterFrame {
     target: string;
     task: string;
     context?: string;
+    sessionId?: string;  // Reuse session for multi-turn conversation
+    images?: ImageContent[];
   };
 }
 
@@ -162,6 +198,7 @@ export interface HandoffStreamChunk extends ClusterFrame {
     delta: string;
     done: boolean;
     artifacts?: Artifact[];
+    sessionId?: string;     // included for session watchers (multi-device sync)
   };
 }
 
@@ -177,6 +214,7 @@ export interface HandoffResponse extends ClusterFrame {
     artifacts?: Artifact[];
     inputRequired?: boolean;
     handoffId?: string;
+    sessionId?: string;  // For multi-turn conversation reuse
   };
 }
 
@@ -216,6 +254,7 @@ export interface HandoffInput extends ClusterFrame {
   id: string;
   payload: {
     message: string;
+    images?: ImageContent[];
   };
 }
 
@@ -248,6 +287,36 @@ export interface ToolProxyResponse extends ClusterFrame {
   };
 }
 
+// ── Tool batch proxy ──────────────────────────────────────────────
+export interface ToolBatchItem {
+  tool: string;
+  params: Record<string, unknown>;
+}
+
+export interface ToolBatchResultItem {
+  tool: string;
+  success: boolean;
+  result?: Record<string, unknown>;
+  error?: string;
+}
+
+export interface ToolBatchRequest extends ClusterFrame {
+  type: "tool_batch_req";
+  id: string;
+  payload: {
+    items: ToolBatchItem[];
+    stopOnError?: boolean; // default true
+  };
+}
+
+export interface ToolBatchResponse extends ClusterFrame {
+  type: "tool_batch_res";
+  id: string;
+  payload: {
+    results: ToolBatchResultItem[];
+  };
+}
+
 // ── Device info ───────────────────────────────────────────────────
 export interface DeviceInfo {
   os: string; // e.g. "Darwin 24.6.0", "Linux 6.1.0"
@@ -285,6 +354,7 @@ export interface ModelInfo {
   id: string;
   provider: string;
   description?: string;
+  input?: ("text" | "image")[];
   compat?: ModelCompatInfo;
 }
 
@@ -294,6 +364,11 @@ export interface ToolProxyInfo {
   deny: string[];
 }
 
+export interface AcpAgentInfo {
+  id: string;
+  description: string;
+}
+
 export interface PeerInfo {
   nodeId: string;
   agents: AgentInfo[];
@@ -303,6 +378,8 @@ export interface PeerInfo {
   directPeers?: string[]; // nodeIds this node has direct connections to
   deviceInfo?: DeviceInfo; // system/hardware info
   toolProxy?: ToolProxyInfo;
+  acpAgents?: AcpAgentInfo[]; // ACP agents available on this node
+  latencyMs?: number; // heartbeat RTT (direct) or estimated round-trip (relay)
 }
 
 export interface NodeCapabilities {
@@ -312,6 +389,7 @@ export interface NodeCapabilities {
   tags: string[];
   deviceInfo?: DeviceInfo;
   toolProxy?: ToolProxyInfo;
+  acpAgents?: AcpAgentInfo[];
 }
 
 // ── Ingested events (from Shortcuts automations, etc.) ────────────
@@ -328,7 +406,368 @@ export interface IngestedEvent {
 export interface KnowledgeSyncFrame extends ClusterFrame {
   type: "knowledge_sync";
   payload: {
-    data: string; // base64-encoded Automerge sync message
+    docId: string; // "" = registry, otherwise file relPath
+    data: string;  // base64-encoded Automerge sync message
+  };
+}
+
+// ── Diagnostic (sentinel) ────────────────────────────────────────
+export interface DiagnosticExec extends ClusterFrame {
+  type: "diagnostic_exec";
+  id: string;
+  payload: {
+    command: string;
+    timeout?: number; // seconds, default 30
+  };
+}
+
+export interface DiagnosticExecResponse extends ClusterFrame {
+  type: "diagnostic_exec_res";
+  id: string;
+  payload: {
+    success: boolean;
+    exitCode?: number;
+    stdout?: string;
+    stderr?: string;
+    error?: string;
+  };
+}
+
+export interface DiagnosticStatus extends ClusterFrame {
+  type: "diagnostic_status";
+  id: string;
+}
+
+export interface DiagnosticStatusResponse extends ClusterFrame {
+  type: "diagnostic_status_res";
+  id: string;
+  payload: {
+    gatewayAlive: boolean;
+    uptimeMs: number;
+    pid: number;
+    gatewayPid?: number;
+  };
+}
+
+// ── ACP proxy ─────────────────────────────────────────────────────
+export type AcpSessionMode = "oneshot" | "persistent";
+
+export interface AcpTaskRequest extends ClusterFrame {
+  type: "acp_req";
+  id: string;
+  payload: {
+    agent: string;          // ACP harness: "claude", "codex", "gemini", etc.
+    task?: string;          // prompt to execute (omit to create session without prompting)
+    sessionId?: string;     // existing session ID for follow-up (persistent mode)
+    acpSessionId?: string;  // ACP-level session ID for resume when sessionId is stale
+    mode?: AcpSessionMode;  // default: "oneshot"
+    cwd?: string;           // working directory on remote node
+    images?: ImageContent[];
+  };
+}
+
+export interface AcpStreamChunk extends ClusterFrame {
+  type: "acp_stream";
+  id: string;
+  payload: {
+    delta: string;
+    event?: string;         // "agent_message_chunk" | "tool_call" | etc.
+    done: boolean;
+    sessionId?: string;     // included for session watchers (multi-device sync)
+  };
+}
+
+export interface AcpTaskResponse extends ClusterFrame {
+  type: "acp_res";
+  id: string;
+  payload: {
+    success: boolean;
+    nodeId?: string;
+    agent?: string;
+    result?: string;
+    sessionId?: string;     // returned for persistent sessions
+    acpSessionId?: string;  // ACP-level session ID for future resume
+    stopReason?: string;    // ACP stop reason
+    error?: string;
+  };
+}
+
+export interface AcpCloseRequest extends ClusterFrame {
+  type: "acp_close";
+  id: string;
+  payload: {
+    sessionId: string;
+  };
+}
+
+export interface AcpCloseResponse extends ClusterFrame {
+  type: "acp_close_res";
+  id: string;
+  payload: {
+    success: boolean;
+    error?: string;
+  };
+}
+
+// ── ACP session management ──────────────────────────────────────
+export interface AcpSessionInfo {
+  sessionId: string;
+  cwd: string;
+  title?: string;
+  description?: string;     // first user message (for display in session list)
+  updatedAt?: string;
+  agent?: string;           // which ACP agent (claude, codex, etc.)
+}
+
+export interface AcpListRequest extends ClusterFrame {
+  type: "acp_list_req";
+  id: string;
+  payload: {
+    agent?: string;         // filter by agent type
+    cwd?: string;           // filter by working directory
+  };
+}
+
+export interface AcpListResponse extends ClusterFrame {
+  type: "acp_list_res";
+  id: string;
+  payload: {
+    success: boolean;
+    sessions?: AcpSessionInfo[];
+    error?: string;
+  };
+}
+
+export interface AcpResumeRequest extends ClusterFrame {
+  type: "acp_resume_req";
+  id: string;
+  payload: {
+    agent: string;
+    acpSessionId: string;   // the ACP protocol session ID to resume
+    cwd: string;
+  };
+}
+
+export interface AcpResumeResponse extends ClusterFrame {
+  type: "acp_resume_res";
+  id: string;
+  payload: {
+    success: boolean;
+    sessionId?: string;     // ClawMatrix session ID for follow-up prompts
+    error?: string;
+  };
+}
+
+export interface AcpCancelRequest extends ClusterFrame {
+  type: "acp_cancel";
+  id: string;
+  payload: {
+    sessionId: string;      // ClawMatrix session ID
+  };
+}
+
+export interface AcpCancelResponse extends ClusterFrame {
+  type: "acp_cancel_res";
+  id: string;
+  payload: {
+    success: boolean;
+    error?: string;
+  };
+}
+
+export interface AcpModeInfo {
+  id: string;
+  name: string;
+  description?: string;
+}
+
+export interface AcpSetModeRequest extends ClusterFrame {
+  type: "acp_set_mode";
+  id: string;
+  payload: {
+    sessionId: string;      // ClawMatrix session ID
+    modeId: string;         // e.g. "code", "architect", "ask"
+  };
+}
+
+export interface AcpSetModeResponse extends ClusterFrame {
+  type: "acp_set_mode_res";
+  id: string;
+  payload: {
+    success: boolean;
+    error?: string;
+  };
+}
+
+export interface AcpGetModesRequest extends ClusterFrame {
+  type: "acp_get_modes";
+  id: string;
+  payload: {
+    sessionId: string;
+  };
+}
+
+export interface AcpGetModesResponse extends ClusterFrame {
+  type: "acp_get_modes_res";
+  id: string;
+  payload: {
+    success: boolean;
+    modes?: AcpModeInfo[];
+    currentModeId?: string;
+    error?: string;
+  };
+}
+
+// ── Chat history ──────────────────────────────────────────────────
+
+export interface ChatHistoryMessage {
+  role: "user" | "assistant" | "system" | "tool";
+  text: string;
+  thinking?: string;
+  toolName?: string;
+  toolArgs?: string;
+  toolResult?: string;
+  images?: Array<{ data: string; mediaType: string }>;
+  timestamp?: number;
+}
+
+export interface ChatHistoryRequest extends ClusterFrame {
+  type: "chat_history_req";
+  id: string;
+  payload: {
+    sessionId: string;
+    limit?: number;
+  };
+}
+
+export interface ChatHistoryResponse extends ClusterFrame {
+  type: "chat_history_res";
+  id: string;
+  payload: {
+    success: boolean;
+    messages?: ChatHistoryMessage[];
+    error?: string;
+  };
+}
+
+// ── Task activity (Live Activity push to mobile nodes) ───────────
+
+export type TaskActivityStatus = "started" | "progress" | "completed" | "failed";
+
+export interface TaskActivityFrame extends ClusterFrame {
+  type: "task_activity";
+  payload: {
+    taskId: string;
+    taskType: "acp" | "handoff";
+    status: TaskActivityStatus;
+    agent: string;
+    nodeId: string;           // node where task is running
+    title: string;
+    detail?: string;
+    progress?: number;        // 0.0 - 1.0
+    startedAt: number;
+    elapsedMs?: number;
+    tool?: string;            // current tool being executed
+    toolDone?: boolean;
+  };
+}
+
+// ── Peer approval ────────────────────────────────────────────────
+export interface PeerApprovalNotify extends ClusterFrame {
+  type: "peer_approval_notify";
+  payload: {
+    approvalId: string;
+    nodeId: string;
+    deviceInfo?: DeviceInfo;
+    mode: "notify" | "required";
+    ip?: string;
+    /** Present when this is a resolution notification (approved/denied). */
+    resolution?: {
+      decision: "approve" | "deny";
+      resolvedBy: string;
+    };
+  };
+}
+
+export interface PeerApprovalRequest extends ClusterFrame {
+  type: "peer_approval_req";
+  id: string;
+  payload: {
+    approvalId: string;
+    nodeId: string;
+    deviceInfo?: DeviceInfo;
+    ip?: string;
+  };
+}
+
+export interface PeerApprovalResponse extends ClusterFrame {
+  type: "peer_approval_res";
+  id: string;
+  payload: {
+    approvalId: string;
+    decision: "approve" | "deny";
+  };
+}
+
+// ── Terminal (interactive PTY over WebSocket) ─────────────────────
+
+export interface TerminalOpenRequest extends ClusterFrame {
+  type: "terminal_open";
+  id: string;
+  payload: {
+    shell?: string;
+    cols?: number;
+    rows?: number;
+    cwd?: string;
+    env?: Record<string, string>;
+  };
+}
+
+export interface TerminalOpenResponse extends ClusterFrame {
+  type: "terminal_open_res";
+  id: string;
+  payload: {
+    success: boolean;
+    sessionId?: string;
+    error?: string;
+  };
+}
+
+export interface TerminalData extends ClusterFrame {
+  type: "terminal_data";
+  id: string;
+  payload: {
+    sessionId: string;
+    data: string;        // base64-encoded
+    direction: "input" | "output";
+  };
+}
+
+export interface TerminalResize extends ClusterFrame {
+  type: "terminal_resize";
+  id: string;
+  payload: {
+    sessionId: string;
+    cols: number;
+    rows: number;
+  };
+}
+
+export interface TerminalCloseRequest extends ClusterFrame {
+  type: "terminal_close";
+  id: string;
+  payload: {
+    sessionId: string;
+    exitCode?: number;
+  };
+}
+
+export interface TerminalCloseResponse extends ClusterFrame {
+  type: "terminal_close_res";
+  id: string;
+  payload: {
+    success: boolean;
+    error?: string;
   };
 }
 
@@ -336,6 +775,8 @@ export interface KnowledgeSyncFrame extends ClusterFrame {
 export type AnyClusterFrame =
   | AuthChallenge
   | AuthRequest
+  | AuthKeyExchange
+  | AuthVerify
   | AuthOk
   | AuthFail
   | PeerSync
@@ -357,4 +798,37 @@ export type AnyClusterFrame =
   | HandoffInput
   | ToolProxyRequest
   | ToolProxyResponse
-  | KnowledgeSyncFrame;
+  | ToolBatchRequest
+  | ToolBatchResponse
+  | DiagnosticExec
+  | DiagnosticExecResponse
+  | DiagnosticStatus
+  | DiagnosticStatusResponse
+  | KnowledgeSyncFrame
+  | AcpTaskRequest
+  | AcpStreamChunk
+  | AcpTaskResponse
+  | AcpCloseRequest
+  | AcpCloseResponse
+  | AcpListRequest
+  | AcpListResponse
+  | AcpResumeRequest
+  | AcpResumeResponse
+  | AcpCancelRequest
+  | AcpCancelResponse
+  | AcpSetModeRequest
+  | AcpSetModeResponse
+  | AcpGetModesRequest
+  | AcpGetModesResponse
+  | ChatHistoryRequest
+  | ChatHistoryResponse
+  | PeerApprovalNotify
+  | PeerApprovalRequest
+  | PeerApprovalResponse
+  | TaskActivityFrame
+  | TerminalOpenRequest
+  | TerminalOpenResponse
+  | TerminalData
+  | TerminalResize
+  | TerminalCloseRequest
+  | TerminalCloseResponse;

package/src/web.ts

@@ -288,14 +288,14 @@ export class WebHandler {
       } : undefined,
       clusterTools: [
         "cluster_handoff", "cluster_send", "cluster_peers",
-        "cluster_exec", "cluster_read", "cluster_write", "cluster_tool",
+        "cluster_exec", "cluster_read", "cluster_write", "cluster_edit",
       ],
     };
 
     // All mesh peers share these cluster tools (they all run the ClawMatrix plugin)
     const CLUSTER_TOOLS = [
       "cluster_handoff", "cluster_send", "cluster_peers",
-      "cluster_exec", "cluster_read", "cluster_write", "cluster_tool",
+      "cluster_exec", "cluster_read", "cluster_write", "cluster_edit",
     ];
 
     const peerNodes: Record<string, unknown>[] = peers.map((p) => ({