clawmatrix 0.2.11 → 0.3.1

package/src/types.ts

@@ -420,10 +420,20 @@ export interface ModelInfo {
   compat?: ModelCompatInfo;
 }
 
+export interface ToolCatalogEntry {
+  name: string;
+  description: string;
+  usage?: string;
+  /** JSON Schema for the tool's input parameters (for LLM callers to construct invocations). */
+  inputSchema?: Record<string, unknown>;
+}
+
 export interface ToolProxyInfo {
   enabled: boolean;
   allow: string[];
   deny: string[];
+  /** Optional tool catalog with descriptions and usage hints for remote callers. */
+  catalog?: ToolCatalogEntry[];
 }
 
 export interface AcpAgentInfo {
@@ -559,9 +569,10 @@ export interface AcpStreamChunk extends ClusterFrame {
   id: string;
   payload: {
     delta: string;
-    event?: string;         // "agent_message_chunk" | "tool_call" | etc.
+    event?: string;         // "agent_message_chunk" | "tool_call" | "plan" | "available_commands" | "config_options" | "usage" | "session_info" | etc.
     done: boolean;
     sessionId?: string;     // included for session watchers (multi-device sync)
+    data?: unknown;         // structured data for rich events (plan entries, slash commands, config options, usage stats)
   };
 }
 
@@ -577,6 +588,10 @@ export interface AcpTaskResponse extends ClusterFrame {
     acpSessionId?: string;  // ACP-level session ID for future resume
     stopReason?: string;    // ACP stop reason
     error?: string;
+    configOptions?: AcpConfigOption[];    // initial config options (model, thinking level, etc.)
+    slashCommands?: AcpSlashCommand[];    // available slash commands
+    availableModes?: AcpModeInfo[];       // available session modes
+    currentModeId?: string;               // current mode
   };
 }
 
@@ -605,6 +620,7 @@ export interface AcpSessionInfo {
   description?: string;     // first user message (for display in session list)
   updatedAt?: string;
   agent?: string;           // which ACP agent (claude, codex, etc.)
+  status?: "active" | "idle"; // active = in-memory session with daemon, idle = persisted on disk
 }
 
 export interface AcpListRequest extends ClusterFrame {
@@ -706,6 +722,86 @@ export interface AcpGetModesResponse extends ClusterFrame {
   };
 }
 
+// ── ACP config options ───────────────────────────────────────────
+
+export interface AcpConfigOption {
+  id: string;
+  name: string;
+  type: "select" | "boolean";
+  currentValue: string | boolean;
+  options?: Array<{ id: string; name: string; description?: string }>;
+  description?: string;
+  category?: string;        // "mode" | "model" | "thought_level" | custom
+}
+
+export interface AcpSetConfigRequest extends ClusterFrame {
+  type: "acp_set_config";
+  id: string;
+  payload: {
+    sessionId: string;
+    configId: string;
+    value: string | boolean;
+  };
+}
+
+export interface AcpSetConfigResponse extends ClusterFrame {
+  type: "acp_set_config_res";
+  id: string;
+  payload: {
+    success: boolean;
+    configOptions?: AcpConfigOption[];
+    error?: string;
+  };
+}
+
+// ── ACP subscribe / observe ──────────────────────────────────────
+
+export interface AcpSubscribeRequest extends ClusterFrame {
+  type: "acp_subscribe";
+  id: string;
+  payload: {
+    sessionId: string;      // ClawMatrix session ID to observe
+  };
+}
+
+export interface AcpSubscribeResponse extends ClusterFrame {
+  type: "acp_subscribe_res";
+  id: string;
+  payload: {
+    success: boolean;
+    history?: ChatHistoryMessage[];   // snapshot at subscribe time
+    error?: string;
+  };
+}
+
+export interface AcpUnsubscribeRequest extends ClusterFrame {
+  type: "acp_unsubscribe";
+  payload: {
+    sessionId: string;
+  };
+}
+
+/** Pushed to all peers when a session is created, its title changes, or it completes. */
+export interface AcpSessionNotify extends ClusterFrame {
+  type: "acp_session_notify";
+  payload: {
+    sessionId: string;
+    nodeId: string;
+    event: "created" | "updated" | "completed";
+    title?: string;
+    updatedAt?: string;
+    agent?: string;
+  };
+}
+
+// ── ACP slash commands ──────────────────────────────────────────
+
+export interface AcpSlashCommand {
+  name: string;
+  description: string;
+  input?: { hint?: string };
+}
+
 // ── Chat history ──────────────────────────────────────────────────
 
 export interface ChatHistoryMessage {
@@ -908,6 +1004,12 @@ export type AnyClusterFrame =
   | AcpSetModeResponse
   | AcpGetModesRequest
   | AcpGetModesResponse
+  | AcpSetConfigRequest
+  | AcpSetConfigResponse
+  | AcpSubscribeRequest
+  | AcpSubscribeResponse
+  | AcpUnsubscribeRequest
+  | AcpSessionNotify
   | ChatHistoryRequest
   | ChatHistoryResponse
   | PeerApprovalNotify

package/src/web.ts

@@ -5,7 +5,6 @@ import type { ClawMatrixConfig } from "./config.ts";
 import type { SatelliteContext, IngestedEvent } from "./types.ts";
 import type { HealthTracker } from "./health-tracker.ts";
 import { timingSafeEqual } from "./auth.ts";
-import { renderDashboard } from "./web-ui.ts";
 import { readBody } from "./http-utils.ts";
 
 const COOKIE_NAME = "clawmatrix_token";
@@ -135,13 +134,6 @@ export class WebHandler {
       return true;
     }
 
-    // Serve dashboard HTML (auth checked client-side via API)
-    if (path === "/" && req.method === "GET") {
-      res.writeHead(200, { "Content-Type": "text/html; charset=utf-8" });
-      res.end(renderDashboard(this.config.nodeId));
-      return true;
-    }
-
     // All /api/* routes require auth (async)
     if (path.startsWith("/api/")) {
       this.handleAuthenticatedRoute(req, res, path);
@@ -224,7 +216,7 @@ export class WebHandler {
   private async checkAuth(req: IncomingMessage): Promise<boolean> {
     // Check Authorization header
     const authHeader = req.headers.authorization;
-    if (authHeader?.startsWith("Bearer ") && await timingSafeEqual(authHeader.slice(7), this.token)) {
+    if (authHeader?.startsWith("Bearer ") && timingSafeEqual(authHeader.slice(7), this.token)) {
       return true;
     }
 
@@ -658,7 +650,7 @@ export class WebHandler {
         ssid: ctx.ssid || undefined,
         ip: ctx.ip || undefined,
         router: ctx.router || undefined,
-        cellular: !ctx.ssid,
+        cellular: typeof ctx.cellular === "boolean" ? ctx.cellular : !ctx.ssid,
         country: ctx.country || undefined,
         tools: Array.isArray(ctx.tools) ? ctx.tools : undefined,
         ts: Date.now(),