Tightened up help output & added action commands for some system commands

.github/workflows/build-ts.yml

@@ -22,6 +22,9 @@ permissions:
   pull-requests: read
   contents: read
 
+env:
+  NODE_OPTIONS: --max_old_space_size=8192
+
 jobs:
   build_ts:
     strategy:

ts/packages/dispatcher/src/command/commandHelp.ts

@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 
 import {
+    ActionContext,
     CommandDescriptor,
     CommandDescriptorTable,
 } from "@typeagent/agent-sdk";
@@ -12,6 +13,9 @@ import {
     isCommandDescriptorTable,
 } from "@typeagent/agent-sdk/helpers/command";
 import { getDefaultSubCommandDescriptor } from "./command.js";
+import { displayResult } from "@typeagent/agent-sdk/helpers/display";
+import { dispatcherAgent } from "../context/dispatcher/dispatcherAgent.js";
+import { success } from "typechat";
 
 export function getUsage(command: string, descriptor: CommandDescriptor) {
     if (descriptor.help) {
@@ -117,3 +121,92 @@ export function getHandlerTableUsage(
     }
     return output.join("\n");
 }
+
+export function printStructuredHandlerTableUsage(
+    table: CommandDescriptorTable,
+    command: string | undefined,
+    context: ActionContext<CommandHandlerContext>,
+) {
+    let index: number = 0;
+    const commands: string[][] = [];
+
+    if (command) {
+        const defaultSubCommand = getDefaultSubCommandDescriptor(table);
+        if (defaultSubCommand !== undefined) {
+            displayResult(`${chalk.bold(chalk.underline("Command"))}`, context);
+            displayResult(getUsage(command, defaultSubCommand), context);
+            displayResult("\n", context);
+        }
+
+        if (Object.keys(table.commands).length == 0) {
+            return;
+        }
+
+        displayResult(
+            `${chalk.bold(chalk.underline(`Subcommands: ${table.description}`))}`,
+            context,
+        );
+        displayResult("\n", context);
+        displayResult(
+            `${chalk.bold("Usage")}: @${command} <subcommand> ...`,
+            context,
+        );
+        displayResult("\n", context);
+    } else {
+        displayResult(
+            `${chalk.bold(chalk.underline(table.description))}`,
+            context,
+        );
+        displayResult("\n", context);
+        displayResult(
+            `${chalk.bold("Usage")}: @[<agentName>] <subcommand> ...`,
+            context,
+        );
+        displayResult("\n", context);
+
+        commands[index] = ["Agent Name (* default agent)", "Description"];
+        index++;
+
+        const systemContext = context.sessionContext.agentContext;
+        for (const name of systemContext.agents.getAppAgentNames()) {
+            if (systemContext.agents.isCommandEnabled(name)) {
+                commands[index] = [];
+
+                if (name == "system") {
+                    commands[index].push(`${name} *`);
+                } else {
+                    commands[index].push(name);
+                }
+
+                commands[index].push(
+                    systemContext.agents.getAppAgentDescription(name),
+                );
+
+                index++;
+            }
+        }
+
+        displayResult(commands, context);
+        displayResult("\n", context);
+    }
+
+    const subCommands: string[][] = [];
+    index = 0;
+
+    subCommands[index] = ["Sub commands", "Description"];
+    index++;
+
+    for (const name in table.commands) {
+        const handler = table.commands[name];
+        const subcommand = isCommandDescriptorTable(handler)
+            ? `${name} <subcommand>`
+            : name;
+
+        subCommands[index] = [];
+        subCommands[index].push(subcommand);
+        subCommands[index].push(handler.description);
+        index++;
+    }
+
+    displayResult(subCommands, context);
+}

ts/packages/dispatcher/src/context/dispatcher/dispatcherAgent.ts

@@ -70,7 +70,7 @@ function clarifyRequestAction(
 
 export const dispatcherManifest: AppAgentManifest = {
     emojiChar: "🤖",
-    description: "Built-in agent to dispatch request",
+    description: "Built-in agent to dispatch requests",
     schema: {
         description: "",
         schemaType: "DispatcherActions",

ts/packages/dispatcher/src/context/system/action/configActionHandler.ts

@@ -3,7 +3,7 @@
 
 import { processCommandNoLock } from "../../../command/command.js";
 import { CommandHandlerContext } from "../../commandHandlerContext.js";
-import { ConfigAction } from "../schema/configActionSchema.js";
+import { ConfigAction, ToggleAgent } from "../schema/configActionSchema.js";
 import { AppAction, ActionContext } from "@typeagent/agent-sdk";
 
 export async function executeConfigAction(
@@ -12,9 +12,20 @@ export async function executeConfigAction(
 ) {
     const configAction = action as unknown as ConfigAction;
     switch (configAction.actionName) {
-        case "toggleBot":
+        case "listAgents":
             await processCommandNoLock(
-                `@config bot ${configAction.parameters.enable ? "on" : "off"}`,
+                `@config agent`,
+                context.sessionContext.agentContext,
+            );
+            break;
+        case "toggleAgent":
+            const agentAction = configAction as ToggleAgent;
+            const cmdParam: string = configAction.parameters.enable
+                ? ``
+                : `--off`;
+
+            await processCommandNoLock(
+                `@config agent ${cmdParam} ${configAction.parameters.agentNames.join(" ")}`,
                 context.sessionContext.agentContext,
             );
             break;

ts/packages/dispatcher/src/context/system/action/historyActionHandler.ts

@@ -0,0 +1,41 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+import { ActionContext, AppAction } from "@typeagent/agent-sdk";
+import { CommandHandlerContext } from "../../commandHandlerContext.js";
+import { processCommandNoLock } from "../../../command/command.js";
+import {
+    DeleteHistoryAction,
+    HistoryAction,
+} from "../schema/historyActionSchema.js";
+
+export async function executeHistoryAction(
+    action: AppAction,
+    context: ActionContext<CommandHandlerContext>,
+) {
+    const historyAction = action as HistoryAction;
+    switch (historyAction.actionName) {
+        case "delete":
+            const deleteAction = historyAction as DeleteHistoryAction;
+            await processCommandNoLock(
+                `@history delete ${deleteAction.parameters.messageNumber}`,
+                context.sessionContext.agentContext,
+            );
+            break;
+        case "clear":
+            await processCommandNoLock(
+                `@history clear`,
+                context.sessionContext.agentContext,
+            );
+            break;
+        case "list":
+            await processCommandNoLock(
+                `@history list`,
+                context.sessionContext.agentContext,
+            );
+            break;
+        default:
+            throw new Error(`Invalid action name: ${action.actionName}`);
+    }
+    return undefined;
+}

ts/packages/dispatcher/src/context/system/action/notificationActionHandler.ts

@@ -0,0 +1,41 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+import { ActionContext, AppAction } from "@typeagent/agent-sdk";
+import {
+    NotificationAction,
+    ShowNotificationsAction,
+} from "../schema/notificationActionSchema.js";
+import { CommandHandlerContext } from "../../commandHandlerContext.js";
+import { processCommandNoLock } from "../../../command/command.js";
+
+export async function executeNotificationAction(
+    action: AppAction,
+    context: ActionContext<CommandHandlerContext>,
+) {
+    const notificationAction = action as NotificationAction;
+    switch (notificationAction.actionName) {
+        case "show":
+            const showAction = notificationAction as ShowNotificationsAction;
+            await processCommandNoLock(
+                `@notify show ${showAction.parameters.filter}`,
+                context.sessionContext.agentContext,
+            );
+            break;
+        case "summary":
+            await processCommandNoLock(
+                `@notify info`,
+                context.sessionContext.agentContext,
+            );
+            break;
+        case "clear":
+            await processCommandNoLock(
+                `@notify clear`,
+                context.sessionContext.agentContext,
+            );
+            break;
+        default:
+            throw new Error(`Invalid action name: ${action.actionName}`);
+    }
+    return undefined;
+}

ts/packages/dispatcher/src/context/system/schema/configActionSchema.ts

@@ -2,15 +2,22 @@
 // Licensed under the MIT License.
 
 export type ConfigAction =
-    | ToggleBotAction
+    | ListAgents
+    | ToggleAgent
     | ToggleExplanationAction
     | ToggleDeveloperModeAction;
 
-// Toggle use of LLM, bot or AI.
-export type ToggleBotAction = {
-    actionName: "toggleBot";
+// Shows the list of available agents
+export type ListAgents = {
+    actionName: "listAgents";
+};
+
+// Toggle use of LLM, agent or AI.
+export type ToggleAgent = {
+    actionName: "toggleAgent";
     parameters: {
         enable: boolean;
+        agentNames: string[];
     };
 };
 

ts/packages/dispatcher/src/context/system/schema/historyActionSchema.ts

@@ -0,0 +1,25 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+export type HistoryAction =
+    | ListHistoryAction
+    | ClearHistoryAction
+    | DeleteHistoryAction;
+
+// Shows the chat history
+export type ListHistoryAction = {
+    actionName: "list";
+};
+
+// Clears the chat history
+export type ClearHistoryAction = {
+    actionName: "clear";
+};
+
+// Deletes a specific message from the chat history
+export type DeleteHistoryAction = {
+    actionName: "delete";
+    parameters: {
+        messageNumber: number;
+    };
+};

ts/packages/dispatcher/src/context/system/schema/notificationActionSchema.ts

@@ -0,0 +1,27 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+export type NotificationAction =
+    | ShowNotificationsAction
+    | ShowNotificationSummaryAction
+    | ClearNotificationsAction;
+
+// Shows notifications based on the supplied filter
+export type ShowNotificationsAction = {
+    actionName: "show";
+    parameters: {
+        filter: NotificationFilter;
+    };
+};
+
+export type NotificationFilter = "all" | "unread";
+
+// Shows notification summary
+export type ShowNotificationSummaryAction = {
+    actionName: "summary";
+};
+
+// Clears the notifications
+export type ClearNotificationsAction = {
+    actionName: "clear";
+};