appduct 0.12.0 → 0.14.0

package/dist/cli/routes/daemon/run.js

@@ -484,6 +484,7 @@ var RpcApplicationError = class extends Error {
     this.name = "RpcApplicationError";
   }
 };
+var appBackgroundedMessage = (alias) => `Session "${alias}" is suspended because the app is in the background. Bring the app to the foreground to resume it.`;
 
 // src/daemon/timers.ts
 var systemTimers = {
@@ -586,7 +587,7 @@ var createCallsManager = (options) => {
     const message = { type: "tool_cancel", session_id: sessionId, id: callId, reason };
     return options.sendCancel(sessionId, message);
   };
-  const rejectSession = (sessionId, errorType) => {
+  const rejectSession = (sessionId, errorType, options2 = {}) => {
     const sessionMap = pendingBySession.get(sessionId);
     if (!sessionMap) {
       return;
@@ -594,13 +595,19 @@ var createCallsManager = (options) => {
     pendingBySession.delete(sessionId);
     for (const pending of sessionMap.values()) {
       timers.clearTimeout(pending.timer);
-      pending.reject(new RpcApplicationError(errorType, `Session transitioned while the call was pending.`));
+      pending.reject(
+        new RpcApplicationError(
+          errorType,
+          options2.backgrounded ? appBackgroundedMessage(pending.alias) : "Session transitioned while the call was pending."
+        )
+      );
     }
   };
   const unsubscribeFromEventBus = options.eventBus.subscribe((event) => {
     const errorType = TERMINATING_KIND_ERROR_TYPES[event.kind];
     if (errorType && event.sessionId) {
-      rejectSession(event.sessionId, errorType);
+      const backgrounded = event.kind === "session_suspended" && event.data.reason === "app_backgrounded";
+      rejectSession(event.sessionId, errorType, { backgrounded });
     }
   });
   const disposeAll = () => {
@@ -614,6 +621,71 @@ var createCallsManager = (options) => {
 
 // src/daemon/event-bus.ts
 var TERMINAL_EVENT_KINDS = /* @__PURE__ */ new Set(["session_expired", "session_revoked"]);
+var utf8ByteLength = (text) => Buffer.byteLength(text, "utf8");
+var truncateToUtf8Bytes = (text, maxBytes) => {
+  const encoded = Buffer.from(text, "utf8");
+  if (encoded.length <= maxBytes) {
+    return text;
+  }
+  const decoder = new TextDecoder("utf-8", { fatal: true });
+  for (let end = maxBytes; end > 0; end--) {
+    try {
+      return decoder.decode(encoded.subarray(0, end));
+    } catch {
+    }
+  }
+  return "";
+};
+var matchesNameGlob = (pattern, name) => {
+  const pieces = pattern.split("*");
+  const first = pieces[0] ?? "";
+  if (pieces.length === 1) {
+    return name === first;
+  }
+  const last = pieces[pieces.length - 1] ?? "";
+  if (first.length + last.length > name.length || !name.startsWith(first) || !name.endsWith(last)) {
+    return false;
+  }
+  const end = name.length - last.length;
+  let position = first.length;
+  for (const piece of pieces.slice(1, -1)) {
+    const found = name.indexOf(piece, position);
+    if (found === -1 || found + piece.length > end) {
+      return false;
+    }
+    position = found + piece.length;
+  }
+  return true;
+};
+var projectAppEvent = (event, options = {}) => {
+  if (event.kind !== "app_event") {
+    return event;
+  }
+  const data = event.data;
+  if (options.name !== void 0 && !(typeof data.name === "string" && matchesNameGlob(options.name, data.name))) {
+    return void 0;
+  }
+  if (options.payloadMaxBytes === void 0 || !("payload" in data)) {
+    return event;
+  }
+  const payloadJson = JSON.stringify(data.payload);
+  if (payloadJson === void 0) {
+    return event;
+  }
+  const payloadBytes = utf8ByteLength(payloadJson);
+  if (payloadBytes <= options.payloadMaxBytes) {
+    return event;
+  }
+  return {
+    ...event,
+    data: {
+      name: data.name,
+      payloadPreview: truncateToUtf8Bytes(payloadJson, options.payloadMaxBytes),
+      truncated: true,
+      payloadBytes
+    }
+  };
+};
 var createEventBus = (options = {}) => {
   const clock = options.clock ?? { now: () => /* @__PURE__ */ new Date() };
   const bufferSize = options.bufferSize ?? 256;
@@ -631,8 +703,9 @@ var createEventBus = (options = {}) => {
   return {
     emit: (event) => {
       const sessionId = event.sessionId;
-      const seq = sessionId !== void 0 ? (cursors.get(sessionId) ?? 0) + 1 : 0;
-      if (sessionId !== void 0) {
+      let seq = 0;
+      if (sessionId !== void 0 && event.kind === "app_event") {
+        seq = (cursors.get(sessionId) ?? 0) + 1;
         cursors.set(sessionId, seq);
       }
       const notification = {
@@ -664,15 +737,26 @@ var createEventBus = (options = {}) => {
     since: (sessionId, query = {}) => {
       const buffer = buffers.get(sessionId) ?? [];
       const sessionCursor = cursors.get(sessionId) ?? 0;
-      let events = buffer.slice();
+      const sinceValue = query.since ?? 0;
+      const oldestRetainedSeq = buffer.length > 0 ? buffer[0].seq : void 0;
+      const dropped = oldestRetainedSeq !== void 0 ? Math.max(0, oldestRetainedSeq - sinceValue - 1) : 0;
+      let matching = buffer.slice();
       if (query.since !== void 0) {
-        events = events.filter((event) => event.seq > query.since);
+        matching = matching.filter((event) => event.seq > query.since);
+      }
+      if (query.name !== void 0) {
+        matching = matching.filter((event) => projectAppEvent(event, { name: query.name }) !== void 0);
       }
+      let events = matching;
       if (query.limit !== void 0 && events.length > query.limit) {
         events = events.slice(0, query.limit);
       }
+      const remaining = matching.length - events.length;
       const cursor = events.length > 0 ? events[events.length - 1].seq : sessionCursor;
-      return { events, cursor };
+      if (query.payloadMaxBytes !== void 0) {
+        events = events.map((event) => projectAppEvent(event, { payloadMaxBytes: query.payloadMaxBytes }));
+      }
+      return { events, cursor, dropped, remaining };
     },
     drop: (sessionId) => {
       buffers.delete(sessionId);
@@ -714,6 +798,8 @@ import {
   isEventMessage,
   isToolCallProgressMessage,
   isToolErrorMessage,
+  isEventRegistryDeltaMessage,
+  isEventRegistrySnapshotMessage,
   isToolRegistryDeltaMessage,
   isToolRegistrySnapshotMessage,
   isToolResultMessage,
@@ -811,7 +897,7 @@ var createPendingLinkRegistry = (options) => {
 };
 
 // src/daemon/registry.ts
-var createToolRegistry = (onChange) => {
+var createRegistry = (onChange) => {
   let tools = /* @__PURE__ */ new Map();
   const notify = () => {
     onChange?.();
@@ -841,6 +927,8 @@ var RESUME_TOKEN_BYTES = 32;
 var POST_CLAIM_MESSAGE_TYPES = /* @__PURE__ */ new Set([
   "tool_registry_snapshot",
   "tool_registry_delta",
+  "event_registry_snapshot",
+  "event_registry_delta",
   "tool_result",
   "tool_error",
   "tool_call_progress",
@@ -911,6 +999,7 @@ var createSessionManager = (options) => {
       createdAt: session.createdAt.toISOString(),
       claimedAt: session.claimedAt.toISOString(),
       ...session.suspendedAt ? { suspendedAt: session.suspendedAt.toISOString() } : {},
+      ...session.suspendReason ? { suspendReason: session.suspendReason } : {},
       toolCount: session.registry.count()
     };
   };
@@ -947,7 +1036,8 @@ var createSessionManager = (options) => {
       alias: session.alias,
       resume_token: session.resumeToken.toString("base64url"),
       keepalive_interval_s: options.keepaliveIntervalSeconds,
-      grace_s: options.graceSeconds
+      grace_s: options.graceSeconds,
+      event_registry: true
     };
     socket.send(JSON.stringify(ack), (error) => {
       if (error) {
@@ -955,17 +1045,18 @@ var createSessionManager = (options) => {
       }
     });
   };
-  const suspend = (sessionId) => {
+  const suspend = (sessionId, reason) => {
     const session = sessions.get(sessionId);
     if (!session || session.state !== "active") {
       return;
     }
     session.state = "suspended";
     session.suspendedAt = clock.now();
+    session.suspendReason = reason;
     session.socket = void 0;
     session.missedPongs = 0;
     session.graceTimer = timers.setTimeout(() => expire(sessionId), options.graceSeconds * 1e3);
-    emit("session_suspended", session.sessionId, session.alias, {});
+    emit("session_suspended", session.sessionId, session.alias, { reason });
   };
   const expire = (sessionId) => {
     const session = sessions.get(sessionId);
@@ -982,9 +1073,10 @@ var createSessionManager = (options) => {
     socket.on("pong", () => {
       session.missedPongs = 0;
     });
-    socket.on("close", () => {
+    socket.on("close", (code, reason) => {
       if (session.socket === socket) {
-        suspend(session.sessionId);
+        const backgrounded = code === 1001 && reason.toString("utf8") === "app_backgrounded";
+        suspend(session.sessionId, backgrounded ? "app_backgrounded" : "connection_lost");
       }
     });
   };
@@ -996,7 +1088,7 @@ var createSessionManager = (options) => {
       if (session.missedPongs >= 2) {
         const staleSocket = session.socket;
         session.socket = void 0;
-        suspend(session.sessionId);
+        suspend(session.sessionId, "connection_lost");
         staleSocket.terminate();
         continue;
       }
@@ -1061,8 +1153,11 @@ var createSessionManager = (options) => {
       resumeToken: randomBytes3(RESUME_TOKEN_BYTES),
       socket,
       missedPongs: 0,
-      registry: createToolRegistry(() => {
+      registry: createRegistry(() => {
         emit("tools_changed", sessionId, alias, { toolCount: session.registry.count() });
+      }),
+      eventRegistry: createRegistry(() => {
+        emit("events_changed", sessionId, alias, { eventCount: session.eventRegistry.count() });
       })
     };
     sessions.set(sessionId, session);
@@ -1094,6 +1189,7 @@ var createSessionManager = (options) => {
     session.resumeToken = randomBytes3(RESUME_TOKEN_BYTES);
     session.state = "active";
     session.suspendedAt = void 0;
+    session.suspendReason = void 0;
     session.socket = socket;
     session.missedPongs = 0;
     attachSocketHandlers(session);
@@ -1128,6 +1224,26 @@ var createSessionManager = (options) => {
         }
         return;
       }
+      case "event_registry_snapshot": {
+        if (!isEventRegistrySnapshotMessage(message)) {
+          closeSocket(socket, 1008, "invalid_registry");
+          return;
+        }
+        session.eventRegistry.snapshot(message.events);
+        return;
+      }
+      case "event_registry_delta": {
+        if (!isEventRegistryDeltaMessage(message)) {
+          closeSocket(socket, 1008, "invalid_registry");
+          return;
+        }
+        if (message.operation === "upsert") {
+          session.eventRegistry.upsert(message.event);
+        } else {
+          session.eventRegistry.remove(message.name);
+        }
+        return;
+      }
       case "tool_result": {
         if (!isToolResultMessage(message)) {
           closeSocket(socket, 1008, "invalid_message");
@@ -1195,7 +1311,14 @@ var createSessionManager = (options) => {
   };
   const resolveForTools = (selector) => {
     const session = resolveSession(selector);
-    return { sessionId: session.sessionId, alias: session.alias, state: session.state, registry: session.registry };
+    return {
+      sessionId: session.sessionId,
+      alias: session.alias,
+      state: session.state,
+      suspendReason: session.suspendReason,
+      registry: session.registry,
+      eventRegistry: session.eventRegistry
+    };
   };
   const sendToApp = (sessionId, message) => {
     const session = sessions.get(sessionId);
@@ -1963,6 +2086,26 @@ var asSelectorParams = (params) => {
   }
   return { selector };
 };
+var asPageParams = (record) => {
+  const limit = record.limit;
+  if (limit !== void 0 && (typeof limit !== "number" || !Number.isInteger(limit) || limit <= 0)) {
+    throw new RpcApplicationError("invalid_request", '"limit" must be a positive integer.');
+  }
+  const offset = record.offset;
+  if (offset !== void 0 && (typeof offset !== "number" || !Number.isInteger(offset) || offset < 0)) {
+    throw new RpcApplicationError("invalid_request", '"offset" must be a non-negative integer.');
+  }
+  return { limit, offset };
+};
+var asEventsListParams = (params) => {
+  const { selector } = asSelectorParams(params);
+  const record = asRecordParams(params);
+  const name = record.name;
+  if (name !== void 0 && typeof name !== "string") {
+    throw new RpcApplicationError("invalid_request", '"name" must be a string.');
+  }
+  return { selector, name, ...asPageParams(record) };
+};
 var asToolsListParams = (params) => {
   const { selector } = asSelectorParams(params);
   const record = asRecordParams(params);
@@ -1980,14 +2123,7 @@ var asToolsListParams = (params) => {
       `"filter" must be a string of at most ${MAX_TOOLS_FILTER_LENGTH} characters.`
     );
   }
-  const limit = record.limit;
-  if (limit !== void 0 && (typeof limit !== "number" || !Number.isInteger(limit) || limit <= 0)) {
-    throw new RpcApplicationError("invalid_request", '"limit" must be a positive integer.');
-  }
-  const offset = record.offset;
-  if (offset !== void 0 && (typeof offset !== "number" || !Number.isInteger(offset) || offset < 0)) {
-    throw new RpcApplicationError("invalid_request", '"offset" must be a non-negative integer.');
-  }
+  const { limit, offset } = asPageParams(record);
   return {
     selector,
     group,
@@ -2072,7 +2208,26 @@ var asEventsSubscribeParams = (params) => {
     }
     kinds = kindsRaw;
   }
-  return { sessionSelector, kinds };
+  const name = record.name;
+  if (name !== void 0 && typeof name !== "string") {
+    throw new RpcApplicationError("invalid_request", '"name" must be a string.');
+  }
+  const payloadMaxBytes = asPayloadMaxBytes(record.payloadMaxBytes);
+  return {
+    sessionSelector,
+    kinds,
+    name,
+    payloadMaxBytes
+  };
+};
+var asPayloadMaxBytes = (value) => {
+  if (value === void 0) {
+    return void 0;
+  }
+  if (typeof value !== "number" || !Number.isInteger(value) || value <= 0) {
+    throw new RpcApplicationError("invalid_request", '"payloadMaxBytes" must be a positive integer.');
+  }
+  return value;
 };
 var asEventsSinceParams = (params) => {
   const record = asRecordParams(params);
@@ -2088,10 +2243,17 @@ var asEventsSinceParams = (params) => {
   if (limit !== void 0 && (typeof limit !== "number" || !Number.isInteger(limit) || limit <= 0)) {
     throw new RpcApplicationError("invalid_request", '"limit" must be a positive integer.');
   }
+  const name = record.name;
+  if (name !== void 0 && typeof name !== "string") {
+    throw new RpcApplicationError("invalid_request", '"name" must be a string.');
+  }
+  const payloadMaxBytes = asPayloadMaxBytes(record.payloadMaxBytes);
   return {
     selector,
     since,
-    limit
+    limit,
+    name,
+    payloadMaxBytes
   };
 };
 var asLinkCreateParams = (params) => {
@@ -2238,10 +2400,17 @@ var startDaemon = async (options) => {
         if (subscription.kinds && !subscription.kinds.has(event.kind)) {
           continue;
         }
+        const projected = projectAppEvent(event, {
+          name: subscription.name,
+          payloadMaxBytes: subscription.payloadMaxBytes
+        });
+        if (projected === void 0) {
+          continue;
+        }
         if (subscription.sessionSelector !== void 0 && event.sessionId !== subscription.sessionSelector && event.alias !== subscription.sessionSelector) {
           continue;
         }
-        server?.notify(connection, event);
+        server?.notify(connection, projected);
       }
     });
     server = await startRpcServer({
@@ -2285,6 +2454,17 @@ var startDaemon = async (options) => {
           activeSessionManager.revoke(selector);
           return { ok: true };
         },
+        [RPC_METHODS.eventsList]: (params) => {
+          const { selector, name, limit, offset } = asEventsListParams(params);
+          const registered = activeSessionManager.resolveForTools(selector).eventRegistry.list();
+          const sorted = registered.sort((a, b) => a.name < b.name ? -1 : a.name > b.name ? 1 : 0);
+          const matching = name === void 0 ? sorted : sorted.filter((event) => matchesNameGlob(name, event.name));
+          const start = offset ?? 0;
+          return {
+            events: limit === void 0 ? matching.slice(start) : matching.slice(start, start + limit),
+            total: matching.length
+          };
+        },
         [RPC_METHODS.toolsList]: (params) => {
           const { selector, group, filter, limit, offset } = asToolsListParams(params);
           const resolved = activeSessionManager.resolveForTools(selector);
@@ -2332,7 +2512,10 @@ var startDaemon = async (options) => {
           if (resolved.state !== "active") {
             const errorType = resolved.state === "suspended" ? "session_suspended" : "session_not_active";
             writeAudit("error", errorType);
-            throw new RpcApplicationError(errorType, `Session "${resolved.alias}" is not active.`);
+            throw new RpcApplicationError(
+              errorType,
+              resolved.suspendReason === "app_backgrounded" ? appBackgroundedMessage(resolved.alias) : `Session "${resolved.alias}" is not active.`
+            );
           }
           const tool = resolved.registry.get(name);
           if (!tool) {
@@ -2420,17 +2603,19 @@ var startDaemon = async (options) => {
           return { cancelled };
         },
         [RPC_METHODS.eventsSubscribe]: (params, context) => {
-          const { sessionSelector, kinds } = asEventsSubscribeParams(params);
+          const { sessionSelector, kinds, name, payloadMaxBytes } = asEventsSubscribeParams(params);
           context.connection.state.eventSubscription = {
             sessionSelector,
-            kinds: kinds ? new Set(kinds) : void 0
+            kinds: kinds ? new Set(kinds) : void 0,
+            name,
+            payloadMaxBytes
           };
           return { ok: true };
         },
         [RPC_METHODS.eventsSince]: (params) => {
-          const { selector, since, limit } = asEventsSinceParams(params);
+          const { selector, since, limit, name, payloadMaxBytes } = asEventsSinceParams(params);
           const resolved = activeSessionManager.describe(selector);
-          return activeEventBus.since(resolved.sessionId, { since, limit });
+          return activeEventBus.since(resolved.sessionId, { since, limit, name, payloadMaxBytes });
         }
       }
     });
@@ -2674,6 +2859,7 @@ var formatJson = (value, flags) => {
 import pc from "picocolors";
 import {
   formatAgentWebSocketUrl,
+  renderEventSignature,
   renderToolSignature,
   summarizeToolDescription
 } from "@appduct/shared";
@@ -2769,6 +2955,13 @@ var formatDevice = (device) => {
   const label = parts.length > 0 ? parts.join(" ") : "unknown device";
   return device.os ? `${label} (${device.os})` : label;
 };
+var SUSPEND_REASON_LABELS = {
+  app_backgrounded: "app in background",
+  connection_lost: "connection lost"
+};
+var formatSessionState = (session) => {
+  return session.suspendReason ? `${session.state} (${SUSPEND_REASON_LABELS[session.suspendReason]})` : session.state;
+};
 var renderLsData = (colors, data, now) => {
   if (data.length === 0) {
     return [colors.dim("Sessions"), "  No Appduct sessions are registered."];
@@ -2777,7 +2970,7 @@ var renderLsData = (colors, data, now) => {
   const headers = ["Alias", "State", "Device", "Tools", "Age"];
   const rows = data.map((session) => [
     session.alias,
-    session.state,
+    formatSessionState(session),
     formatDevice(session.device),
     String(session.toolCount),
     formatAge(session.claimedAt ?? session.createdAt, nowIso)
@@ -2791,9 +2984,6 @@ var renderLsData = (colors, data, now) => {
     ...rows.map((row) => `  ${row.map((cell, index) => cell.padEnd(widths[index])).join("  ")}`)
   ];
 };
-var isToolsListing = (data) => {
-  return typeof data === "object" && data !== null && Array.isArray(data.tools);
-};
 var isToolGroupsListing = (data) => {
   return typeof data === "object" && data !== null && Array.isArray(data.groups) && !Array.isArray(data.tools);
 };
@@ -2811,7 +3001,7 @@ var renderEmptyToolsLine = (data) => {
   }
   if (data.group !== void 0) {
     const match = data.filter === void 0 ? "" : ` match ${JSON.stringify(data.filter)}`;
-    return `  No tools in group ${JSON.stringify(data.group)}${match}. Run \`appduct tools --groups\` to see the session's groups.`;
+    return `  No tools in group ${JSON.stringify(data.group)}${match}. Run \`appduct tools ls --groups\` to see the session's groups.`;
   }
   return data.filter === void 0 ? "  No tools registered." : `  No tools match ${JSON.stringify(data.filter)}.`;
 };
@@ -2893,7 +3083,7 @@ var renderToolSummaryTable = (colors, data) => {
     ...grouped ? renderGroupedToolLines(colors, data.tools) : data.tools.flatMap((tool) => renderToolSummaryLines(tool, "  ")),
     ...renderTruncationLine(data),
     "",
-    "Run `appduct tools <name>` for a tool's full schema."
+    "Run `appduct tools describe <name>` for a tool's full schema."
   ];
 };
 var renderToolDetail = (colors, tool, flags) => {
@@ -2945,18 +3135,62 @@ var renderToolGroups = (colors, data) => {
     colors.green("Groups"),
     ...data.groups.map((entry) => `  ${label(entry).padEnd(width)}  ${String(entry.total).padStart(countWidth)}`),
     "",
-    `${data.total} tool${data.total === 1 ? "" : "s"} in total. ` + (hasAnyGroup(data.groups) ? "Run `appduct tools --group <name>` to list one group's tools." : "No tool declares a group.")
+    `${data.total} tool${data.total === 1 ? "" : "s"} in total. ` + (hasAnyGroup(data.groups) ? "Run `appduct tools ls --group <name>` to list one group's tools." : "No tool declares a group.")
   ];
 };
-var renderToolsData = (colors, data, flags, full) => {
+var renderToolsListData = (colors, data, flags, full) => {
   if (isToolGroupsListing(data)) {
     return renderToolGroups(colors, data);
   }
-  if (!isToolsListing(data)) {
-    return renderToolDetail(colors, data, flags);
-  }
   return full ? renderToolsFullListing(colors, data, flags) : renderToolSummaryTable(colors, data);
 };
+var renderEventsTruncationLine = (data) => {
+  const offset = data.offset ?? 0;
+  if (data.events.length >= data.total) {
+    return [];
+  }
+  return [
+    "",
+    `Showing ${data.events.length} of ${data.total} events (offset ${offset}). Narrow with --name <glob> or page with --offset <n>.`
+  ];
+};
+var renderEventsListData = (colors, data, flags) => {
+  const [only] = data.events;
+  if (data.name !== void 0 && !data.name.includes("*") && only !== void 0) {
+    return renderFields(
+      colors.green(`Event: ${only.name}`),
+      [
+        ["Signature", renderEventSignature(only)],
+        ["Description", only.description],
+        ["Payload schema", only.payload_schema]
+      ],
+      flags
+    );
+  }
+  if (data.events.length === 0 && data.total > 0) {
+    return [
+      colors.green("Events"),
+      `  No events at offset ${data.offset ?? 0}; ${data.total} matching event${data.total === 1 ? "" : "s"} in total.`
+    ];
+  }
+  if (data.events.length === 0) {
+    return [
+      colors.green("Events"),
+      data.name === void 0 ? "  No events declared." : `  No events match ${JSON.stringify(data.name)}.`
+    ];
+  }
+  const lines = data.events.flatMap((event) => [
+    `  ${renderEventSignature(event)}`,
+    `    ${summarizeToolDescription(event.description)}`
+  ]);
+  return [
+    colors.green("Events"),
+    ...lines,
+    ...renderEventsTruncationLine(data),
+    "",
+    "Run `appduct events ls --name <name>` for an event's full payload schema."
+  ];
+};
 var renderInvokeData = (colors, data, flags) => {
   return [colors.green("Result"), formatScalar(data, flags)];
 };
@@ -3140,15 +3374,19 @@ var renderSuccessData = (colors, command, data, options) => {
       return renderInitData(colors, data, flags);
     case "keygen":
       return renderKeygenData(colors, data, flags);
-    case "link":
+    case "sessions link":
       return renderLinkData(colors, data, flags, options.qr);
-    case "ls":
+    case "sessions ls":
       return renderLsData(colors, data, options.now ?? /* @__PURE__ */ new Date());
-    case "tools":
-      return renderToolsData(colors, data, flags, options.full);
-    case "invoke":
+    case "tools ls":
+      return renderToolsListData(colors, data, flags, options.full);
+    case "tools describe":
+      return renderToolDetail(colors, data, flags);
+    case "events ls":
+      return renderEventsListData(colors, data, flags);
+    case "tools call":
       return renderInvokeData(colors, data, flags);
-    case "revoke":
+    case "sessions revoke":
       return renderRevokeData(colors, data);
     case "daemon run":
       return renderDaemonRunData(colors, data, flags);