@pooder/core 2.0.0 → 2.1.0

package/src/index.ts

@@ -1,145 +1,161 @@
-import { Service, ServiceRegistry } from "./service";
-import EventBus from "./event";
-import { ExtensionManager } from "./extension";
-import Disposable from "./disposable";
-import {
-  Contribution,
-  ContributionPoint,
-  ContributionPointIds,
-  ContributionRegistry,
-} from "./contribution";
-import { CommandService, ConfigurationService, WorkbenchService } from "./services";
-import { ExtensionContext } from "./context";
-
-export * from "./extension";
-export * from "./context";
-export * from "./contribution";
-export * from "./service";
-export * from "./services";
-export { default as EventBus } from "./event";
-
-export class Pooder {
-  readonly eventBus: EventBus = new EventBus();
-  private readonly services: ServiceRegistry = new ServiceRegistry();
-  private readonly contributions: ContributionRegistry =
-    new ContributionRegistry();
-  readonly extensionManager: ExtensionManager;
-
-  constructor() {
-    // Initialize default contribution points
-    this.initDefaultContributionPoints();
-
-    const commandService = new CommandService();
-    this.registerService(commandService, "CommandService");
-
-    const configurationService = new ConfigurationService();
-    this.registerService(configurationService, "ConfigurationService");
-
-    const workbenchService = new WorkbenchService();
-    workbenchService.setEventBus(this.eventBus);
-    this.registerService(workbenchService, "WorkbenchService");
-
-    // Create a restricted context for extensions
-    const context: ExtensionContext = {
-      eventBus: this.eventBus,
-      services: {
-        get: <T extends Service>(serviceName: string) =>
-          this.services.get<T>(serviceName),
-      },
-      contributions: {
-        get: <T>(pointId: string) => this.getContributions<T>(pointId),
-        register: <T>(pointId: string, contribution: Contribution<T>) =>
-          this.registerContribution(pointId, contribution),
-      },
-    };
-
-    this.extensionManager = new ExtensionManager(context);
-  }
-
-  private initDefaultContributionPoints() {
-    this.registerContributionPoint({
-      id: ContributionPointIds.CONTRIBUTIONS,
-      description: "Contribution point for contribution points",
-    });
-
-    this.registerContributionPoint({
-      id: ContributionPointIds.COMMANDS,
-      description: "Contribution point for commands",
-    });
-
-    this.registerContributionPoint({
-      id: ContributionPointIds.TOOLS,
-      description: "Contribution point for tools",
-    });
-
-    this.registerContributionPoint({
-      id: ContributionPointIds.VIEWS,
-      description: "Contribution point for UI views",
-    });
-
-    this.registerContributionPoint({
-      id: ContributionPointIds.CONFIGURATIONS,
-      description: "Contribution point for configurations",
-    });
-  }
-
-  // --- Service Management ---
-
-  registerService(service: Service, id?: string) {
-    const serviceId = id || service.constructor.name;
-
-    try {
-      service?.init?.();
-    } catch (e) {
-      console.error(`Error initializing service ${serviceId}:`, e);
-      return false;
-    }
-
-    this.services.register(serviceId, service);
-    this.eventBus.emit("service:register", service);
-    return true;
-  }
-
-  unregisterService(service: Service, id?: string) {
-    const serviceId = id || service.constructor.name;
-    if (!this.services.has(serviceId)) {
-      console.warn(`Service ${serviceId} is not registered.`);
-      return true;
-    }
-
-    try {
-      service?.dispose?.();
-    } catch (e) {
-      console.error(`Error disposing service ${serviceId}:`, e);
-      return false;
-    }
-
-    this.services.delete(serviceId);
-    this.eventBus.emit("service:unregister", service);
-    return true;
-  }
-
-  getService<T extends Service>(id: string): T | undefined {
-    return this.services.get<T>(id);
-  }
-
-  // --- Contribution Management ---
-
-  registerContributionPoint<T>(point: ContributionPoint<T>): void {
-    this.contributions.registerPoint(point);
-    this.eventBus.emit("contribution:point:register", point);
-  }
-
-  registerContribution<T>(
-    pointId: string,
-    contribution: Contribution<T>,
-  ): Disposable {
-    const disposable = this.contributions.register(pointId, contribution);
-    this.eventBus.emit("contribution:register", { ...contribution, pointId });
-    return disposable;
-  }
-
-  getContributions<T>(pointId: string): Contribution<T>[] {
-    return this.contributions.get<T>(pointId);
-  }
-}
+import { Service, ServiceRegistry } from "./service";
+import EventBus from "./event";
+import { ExtensionManager } from "./extension";
+import Disposable from "./disposable";
+import {
+  Contribution,
+  ContributionPoint,
+  ContributionPointIds,
+  ContributionRegistry,
+} from "./contribution";
+import {
+  CommandService,
+  ConfigurationService,
+  ToolRegistryService,
+  ToolSessionService,
+  WorkbenchService,
+} from "./services";
+import { ExtensionContext } from "./context";
+
+export * from "./extension";
+export * from "./context";
+export * from "./contribution";
+export * from "./service";
+export * from "./services";
+export { default as EventBus } from "./event";
+
+export class Pooder {
+  readonly eventBus: EventBus = new EventBus();
+  private readonly services: ServiceRegistry = new ServiceRegistry();
+  private readonly contributions: ContributionRegistry =
+    new ContributionRegistry();
+  readonly extensionManager: ExtensionManager;
+
+  constructor() {
+    // Initialize default contribution points
+    this.initDefaultContributionPoints();
+
+    const commandService = new CommandService();
+    this.registerService(commandService, "CommandService");
+
+    const configurationService = new ConfigurationService();
+    this.registerService(configurationService, "ConfigurationService");
+
+    const toolRegistryService = new ToolRegistryService();
+    this.registerService(toolRegistryService, "ToolRegistryService");
+
+    const toolSessionService = new ToolSessionService();
+    toolSessionService.setCommandService(commandService);
+    toolSessionService.setToolRegistry(toolRegistryService);
+    this.registerService(toolSessionService, "ToolSessionService");
+
+    const workbenchService = new WorkbenchService();
+    workbenchService.setEventBus(this.eventBus);
+    workbenchService.setToolRegistry(toolRegistryService);
+    workbenchService.setToolSessionService(toolSessionService);
+    this.registerService(workbenchService, "WorkbenchService");
+
+    // Create a restricted context for extensions
+    const context: ExtensionContext = {
+      eventBus: this.eventBus,
+      services: {
+        get: <T extends Service>(serviceName: string) =>
+          this.services.get<T>(serviceName),
+      },
+      contributions: {
+        get: <T>(pointId: string) => this.getContributions<T>(pointId),
+        register: <T>(pointId: string, contribution: Contribution<T>) =>
+          this.registerContribution(pointId, contribution),
+      },
+    };
+
+    this.extensionManager = new ExtensionManager(context);
+  }
+
+  private initDefaultContributionPoints() {
+    this.registerContributionPoint({
+      id: ContributionPointIds.CONTRIBUTIONS,
+      description: "Contribution point for contribution points",
+    });
+
+    this.registerContributionPoint({
+      id: ContributionPointIds.COMMANDS,
+      description: "Contribution point for commands",
+    });
+
+    this.registerContributionPoint({
+      id: ContributionPointIds.TOOLS,
+      description: "Contribution point for tools",
+    });
+
+    this.registerContributionPoint({
+      id: ContributionPointIds.VIEWS,
+      description: "Contribution point for UI views",
+    });
+
+    this.registerContributionPoint({
+      id: ContributionPointIds.CONFIGURATIONS,
+      description: "Contribution point for configurations",
+    });
+  }
+
+  // --- Service Management ---
+
+  registerService(service: Service, id?: string) {
+    const serviceId = id || service.constructor.name;
+
+    try {
+      service?.init?.();
+    } catch (e) {
+      console.error(`Error initializing service ${serviceId}:`, e);
+      return false;
+    }
+
+    this.services.register(serviceId, service);
+    this.eventBus.emit("service:register", service);
+    return true;
+  }
+
+  unregisterService(service: Service, id?: string) {
+    const serviceId = id || service.constructor.name;
+    if (!this.services.has(serviceId)) {
+      console.warn(`Service ${serviceId} is not registered.`);
+      return true;
+    }
+
+    try {
+      service?.dispose?.();
+    } catch (e) {
+      console.error(`Error disposing service ${serviceId}:`, e);
+      return false;
+    }
+
+    this.services.delete(serviceId);
+    this.eventBus.emit("service:unregister", service);
+    return true;
+  }
+
+  getService<T extends Service>(id: string): T | undefined {
+    return this.services.get<T>(id);
+  }
+
+  // --- Contribution Management ---
+
+  registerContributionPoint<T>(point: ContributionPoint<T>): void {
+    this.contributions.registerPoint(point);
+    this.eventBus.emit("contribution:point:register", point);
+  }
+
+  registerContribution<T>(
+    pointId: string,
+    contribution: Contribution<T>,
+  ): Disposable {
+    const disposable = this.contributions.register(pointId, contribution);
+    this.eventBus.emit("contribution:register", { ...contribution, pointId });
+    return disposable;
+  }
+
+  getContributions<T>(pointId: string): Contribution<T>[] {
+    return this.contributions.get<T>(pointId);
+  }
+}

package/src/run-test-full.ts

@@ -1,98 +1,98 @@
-import { Pooder } from "./index";
-import { fullExtension } from "./test-extension-full";
-import { ContributionPointIds } from "./contribution";
-import CommandService from "./services/CommandService";
-
-async function runTest() {
-  console.log("Starting Test...");
-  const app = new Pooder();
-
-  // Register the full extension
-  console.log("Registering extension...");
-  app.extensionManager.register(fullExtension);
-  const commandService = app.getService<CommandService>("CommandService")!;
-
-  // 1. Verify Command Contributions
-  console.log("\n--- Verifying Commands ---");
-
-  // 1.1 Imperative Command
-  try {
-    const res = await commandService.executeCommand(
-      "test.imperative.hello",
-      "User",
-    );
-    console.log(
-      `[Imperative] "test.imperative.hello" result: "${res}"` ===
-        `[Imperative] "test.imperative.hello" result: "Hello Imperative User"`
-        ? "✅ PASS"
-        : "❌ FAIL",
-    );
-  } catch (e) {
-    console.error("❌ FAIL: Imperative command failed", e);
-  }
-
-  // 1.2 Declarative Auto-Registered Command
-  try {
-    const res = await commandService.executeCommand("test.declarative.auto");
-    console.log(
-      `[Declarative] "test.declarative.auto" result: "${res}"` ===
-        `[Declarative] "test.declarative.auto" result: "Auto Registered Result"`
-        ? "✅ PASS"
-        : "❌ FAIL",
-    );
-  } catch (e) {
-    console.error("❌ FAIL: Declarative auto-registered command failed", e);
-  }
-
-  // 2. Verify Registry Entries
-  console.log("\n--- Verifying Contribution Registry ---");
-
-  const commands = app.getContributions(ContributionPointIds.COMMANDS);
-  console.log(
-    `Commands registered: ${commands.length}` === "Commands registered: 2"
-      ? "✅ PASS (2 commands found)"
-      : `❌ FAIL (${commands.length} commands found)`,
-  );
-
-  const tools = app.getContributions(ContributionPointIds.TOOLS);
-  console.log(
-    `Tools registered: ${tools.length}` === "Tools registered: 1"
-      ? "✅ PASS (1 tool found)"
-      : `❌ FAIL (${tools.length} tools found)`,
-  );
-
-  const views = app.getContributions(ContributionPointIds.VIEWS);
-  console.log(
-    `Views registered: ${views.length}` === "Views registered: 1"
-      ? "✅ PASS (1 view found)"
-      : `❌ FAIL (${views.length} views found)`,
-  );
-
-  // 3. Unregister and Verify Cleanup
-  console.log("\n--- Verifying Unregistration/Cleanup ---");
-  // The ID is now explicit: "full-feature-test-extension"
-  const extensionId = "full-feature-test-extension";
-  app.extensionManager.unregister(extensionId);
-
-  const commandsAfter = app.getContributions(ContributionPointIds.COMMANDS);
-  console.log(
-    `Commands after unregister: ${commandsAfter.length}` ===
-      "Commands after unregister: 0"
-      ? "✅ PASS"
-      : `❌ FAIL (${commandsAfter.length} left)`,
-  );
-
-  // Verify command service cleanup
-  const cmdMap = commandService.getCommands();
-  const hasCmd = cmdMap.has("test.declarative.auto");
-  console.log(
-    `Command service cleaned up: ${!hasCmd}` ===
-      "Command service cleaned up: true"
-      ? "✅ PASS"
-      : "❌ FAIL (Command still exists)",
-  );
-
-  console.log("\nTest Completed.");
-}
-
-runTest().catch(console.error);
+import { Pooder } from "./index";
+import { fullExtension } from "./test-extension-full";
+import { ContributionPointIds } from "./contribution";
+import CommandService from "./services/CommandService";
+
+async function runTest() {
+  console.log("Starting Test...");
+  const app = new Pooder();
+
+  // Register the full extension
+  console.log("Registering extension...");
+  app.extensionManager.register(fullExtension);
+  const commandService = app.getService<CommandService>("CommandService")!;
+
+  // 1. Verify Command Contributions
+  console.log("\n--- Verifying Commands ---");
+
+  // 1.1 Imperative Command
+  try {
+    const res = await commandService.executeCommand(
+      "test.imperative.hello",
+      "User",
+    );
+    console.log(
+      `[Imperative] "test.imperative.hello" result: "${res}"` ===
+        `[Imperative] "test.imperative.hello" result: "Hello Imperative User"`
+        ? "✅ PASS"
+        : "❌ FAIL",
+    );
+  } catch (e) {
+    console.error("❌ FAIL: Imperative command failed", e);
+  }
+
+  // 1.2 Declarative Auto-Registered Command
+  try {
+    const res = await commandService.executeCommand("test.declarative.auto");
+    console.log(
+      `[Declarative] "test.declarative.auto" result: "${res}"` ===
+        `[Declarative] "test.declarative.auto" result: "Auto Registered Result"`
+        ? "✅ PASS"
+        : "❌ FAIL",
+    );
+  } catch (e) {
+    console.error("❌ FAIL: Declarative auto-registered command failed", e);
+  }
+
+  // 2. Verify Registry Entries
+  console.log("\n--- Verifying Contribution Registry ---");
+
+  const commands = app.getContributions(ContributionPointIds.COMMANDS);
+  console.log(
+    `Commands registered: ${commands.length}` === "Commands registered: 2"
+      ? "✅ PASS (2 commands found)"
+      : `❌ FAIL (${commands.length} commands found)`,
+  );
+
+  const tools = app.getContributions(ContributionPointIds.TOOLS);
+  console.log(
+    `Tools registered: ${tools.length}` === "Tools registered: 1"
+      ? "✅ PASS (1 tool found)"
+      : `❌ FAIL (${tools.length} tools found)`,
+  );
+
+  const views = app.getContributions(ContributionPointIds.VIEWS);
+  console.log(
+    `Views registered: ${views.length}` === "Views registered: 1"
+      ? "✅ PASS (1 view found)"
+      : `❌ FAIL (${views.length} views found)`,
+  );
+
+  // 3. Unregister and Verify Cleanup
+  console.log("\n--- Verifying Unregistration/Cleanup ---");
+  // The ID is now explicit: "full-feature-test-extension"
+  const extensionId = "full-feature-test-extension";
+  app.extensionManager.unregister(extensionId);
+
+  const commandsAfter = app.getContributions(ContributionPointIds.COMMANDS);
+  console.log(
+    `Commands after unregister: ${commandsAfter.length}` ===
+      "Commands after unregister: 0"
+      ? "✅ PASS"
+      : `❌ FAIL (${commandsAfter.length} left)`,
+  );
+
+  // Verify command service cleanup
+  const cmdMap = commandService.getCommands();
+  const hasCmd = cmdMap.has("test.declarative.auto");
+  console.log(
+    `Command service cleaned up: ${!hasCmd}` ===
+      "Command service cleaned up: true"
+      ? "✅ PASS"
+      : "❌ FAIL (Command still exists)",
+  );
+
+  console.log("\nTest Completed.");
+}
+
+runTest().catch(console.error);

package/src/services/CommandService.ts

@@ -1,79 +1,79 @@
-import { Command } from "../command";
-import Disposable from "../disposable";
-import { Service } from "../service";
-
-export default class CommandService implements Service {
-  private commands: Map<string, Command> = new Map();
-
-  /**
-   * Register a command
-   * @param commandId Command Name (ID)
-   * @param handler Command handler function
-   * @param thisArg The `this` context for the handler
-   * @returns Disposable to unregister the command
-   */
-  registerCommand(
-    commandId: string,
-    handler: (...args: any[]) => any,
-    thisArg?: any,
-  ): Disposable {
-    if (this.commands.has(commandId)) {
-      console.warn(
-        `Command "${commandId}" is already registered. Overwriting.`,
-      );
-    }
-
-    const command: Command = {
-      id: commandId,
-      handler: thisArg ? handler.bind(thisArg) : handler,
-    };
-
-    this.commands.set(commandId, command);
-
-    return {
-      dispose: () => {
-        if (this.commands.get(commandId) === command) {
-          this.commands.delete(commandId);
-        }
-      },
-    };
-  }
-
-  /**
-   * Execute a command
-   * @param commandId Command Name (ID)
-   * @param args Arguments to pass to the handler
-   * @returns The result of the command handler
-   */
-  async executeCommand<T = any>(commandId: string, ...args: any[]): Promise<T> {
-    const command = this.commands.get(commandId);
-    if (!command) {
-      throw new Error(`Command "${commandId}" not found.`);
-    }
-
-    try {
-      return await command.handler(...args);
-    } catch (error) {
-      console.error(`Error executing command "${commandId}":`, error);
-      throw error;
-    }
-  }
-
-  /**
-   * Get all registered commands
-   */
-  getCommands(): Map<string, Command> {
-    return this.commands;
-  }
-
-  /**
-   * Get a specific command
-   */
-  getCommand(commandId: string): Command | undefined {
-    return this.commands.get(commandId);
-  }
-
-  dispose() {
-    this.commands.clear();
-  }
-}
+import { Command } from "../command";
+import Disposable from "../disposable";
+import { Service } from "../service";
+
+export default class CommandService implements Service {
+  private commands: Map<string, Command> = new Map();
+
+  /**
+   * Register a command
+   * @param commandId Command Name (ID)
+   * @param handler Command handler function
+   * @param thisArg The `this` context for the handler
+   * @returns Disposable to unregister the command
+   */
+  registerCommand(
+    commandId: string,
+    handler: (...args: any[]) => any,
+    thisArg?: any,
+  ): Disposable {
+    if (this.commands.has(commandId)) {
+      console.warn(
+        `Command "${commandId}" is already registered. Overwriting.`,
+      );
+    }
+
+    const command: Command = {
+      id: commandId,
+      handler: thisArg ? handler.bind(thisArg) : handler,
+    };
+
+    this.commands.set(commandId, command);
+
+    return {
+      dispose: () => {
+        if (this.commands.get(commandId) === command) {
+          this.commands.delete(commandId);
+        }
+      },
+    };
+  }
+
+  /**
+   * Execute a command
+   * @param commandId Command Name (ID)
+   * @param args Arguments to pass to the handler
+   * @returns The result of the command handler
+   */
+  async executeCommand<T = any>(commandId: string, ...args: any[]): Promise<T> {
+    const command = this.commands.get(commandId);
+    if (!command) {
+      throw new Error(`Command "${commandId}" not found.`);
+    }
+
+    try {
+      return await command.handler(...args);
+    } catch (error) {
+      console.error(`Error executing command "${commandId}":`, error);
+      throw error;
+    }
+  }
+
+  /**
+   * Get all registered commands
+   */
+  getCommands(): Map<string, Command> {
+    return this.commands;
+  }
+
+  /**
+   * Get a specific command
+   */
+  getCommand(commandId: string): Command | undefined {
+    return this.commands.get(commandId);
+  }
+
+  dispose() {
+    this.commands.clear();
+  }
+}