opencode-conductor-plugin 1.22.1 → 1.24.0

package/README.test.md

@@ -0,0 +1,51 @@
+# Testing
+
+This project uses [Vitest](https://vitest.dev/) for testing.
+
+## Setup
+
+Install dependencies:
+
+```bash
+npm install
+```
+
+## Running Tests
+
+Run all tests:
+
+```bash
+npm test
+```
+
+Run tests in watch mode:
+
+```bash
+npm run test:watch
+```
+
+Run tests with coverage:
+
+```bash
+npm run test:coverage
+```
+
+## Test Structure
+
+Tests are located alongside the source files with the `.test.ts` extension:
+
+- `src/tools/commands.test.ts` - Tests for command tools
+
+## Writing Tests
+
+Tests use Vitest's API with TypeScript support. Example:
+
+```typescript
+import { describe, it, expect, vi } from "vitest"
+
+describe("MyFeature", () => {
+  it("should work correctly", () => {
+    expect(true).toBe(true)
+  })
+})
+```

package/dist/tools/commands.d.ts

@@ -1,7 +1,11 @@
-import { type PluginInput } from "@opencode-ai/plugin";
 import { type ToolDefinition } from "@opencode-ai/plugin/tool";
-export declare function createSetupTool(ctx: PluginInput): ToolDefinition;
-export declare function createNewTrackTool(ctx: PluginInput): ToolDefinition;
-export declare function createImplementTool(ctx: PluginInput): ToolDefinition;
-export declare function createStatusTool(ctx: PluginInput): ToolDefinition;
-export declare function createRevertTool(ctx: PluginInput): ToolDefinition;
+export declare const setupCommand: (ctx: import("@opencode-ai/plugin").PluginInput) => ToolDefinition;
+export declare const newTrackCommand: (ctx: import("@opencode-ai/plugin").PluginInput) => ToolDefinition;
+export declare const implementCommand: (ctx: import("@opencode-ai/plugin").PluginInput) => ToolDefinition;
+export declare const statusCommand: (ctx: import("@opencode-ai/plugin").PluginInput) => ToolDefinition;
+export declare const revertCommand: (ctx: import("@opencode-ai/plugin").PluginInput) => ToolDefinition;
+export declare function createSetupTool(ctx: any): ToolDefinition;
+export declare function createNewTrackTool(ctx: any): ToolDefinition;
+export declare function createImplementTool(ctx: any): ToolDefinition;
+export declare function createStatusTool(ctx: any): ToolDefinition;
+export declare function createRevertTool(ctx: any): ToolDefinition;

package/dist/tools/commands.js

@@ -1,132 +1,81 @@
 import { tool } from "@opencode-ai/plugin/tool";
+import { createConductorCommand } from "../utils/commandFactory.js";
 import { join, dirname } from "path";
-import { readFile } from "fs/promises";
 import { fileURLToPath } from "url";
+import { readFile } from "fs/promises";
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
-// Helper to load and process prompt templates
-async function loadPrompt(filename, replacements = {}) {
-    const promptPath = join(__dirname, "..", "prompts", filename);
-    try {
-        const content = await readFile(promptPath, "utf-8");
-        const descMatch = content.match(/description\s*=\s*"([^"]+)"/);
-        const description = descMatch ? descMatch[1] : "Conductor Command";
-        const promptMatch = content.match(/prompt\s*=\s*"""([\s\S]*?)"""/);
-        let promptText = promptMatch ? promptMatch[1] : "";
-        if (!promptText)
-            throw new Error(`Could not parse prompt text from ${filename}`);
-        const defaults = {
-            templatesDir: join(dirname(dirname(__dirname)), "templates"),
+export const setupCommand = createConductorCommand({
+    name: "setup.toml",
+    description: "Scaffolds the project and sets up the Conductor environment",
+    args: {},
+});
+export const newTrackCommand = createConductorCommand({
+    name: "newTrack.toml",
+    description: "Plans a track, generates track-specific spec documents and updates the tracks file",
+    args: {
+        description: tool.schema.string().optional().describe("Brief description of the track (feature, bug fix, chore, etc.)"),
+    },
+    additionalContext: async (ctx, args) => {
+        return {
+            args: args.description || "",
         };
-        const finalReplacements = { ...defaults, ...replacements };
-        for (const [key, value] of Object.entries(finalReplacements)) {
-            promptText = promptText.replaceAll(`{{${key}}}`, value || "");
+    },
+});
+export const implementCommand = createConductorCommand({
+    name: "implement.toml",
+    description: "Executes the tasks defined in the specified track's plan",
+    args: {
+        track_name: tool.schema.string().optional().describe("Name or description of the track to implement"),
+    },
+    additionalContext: async (ctx, args) => {
+        // 1. Choose strategy based on OMO activity
+        const strategyFile = ctx.isOMOActive ? "delegate.md" : "manual.md";
+        const strategyPath = join(__dirname, "../prompts/strategies", strategyFile);
+        let strategySection = "";
+        try {
+            strategySection = await readFile(strategyPath, "utf-8");
+        }
+        catch (e) {
+            console.warn(`[Conductor] Failed to load strategy ${strategyFile}:`, e);
+            strategySection = "Error: Could not load execution strategy.";
         }
-        return { prompt: promptText, description: description };
-    }
-    catch (error) {
-        console.error(`[Conductor] Error loading prompt ${filename}:`, error);
         return {
-            prompt: `SYSTEM ERROR: Failed to load prompt ${filename}`,
-            description: "Error loading command",
+            strategy_section: strategySection,
+            track_name: args.track_name || "",
         };
-    }
-}
-// Helper to execute a command prompt in a sub-session
-async function executeCommand(ctx, toolContext, promptText, agent, description) {
-    // Create a sub-session linked to the current one
-    const createResult = await ctx.client.session.create({
-        body: {
-            parentID: toolContext.sessionID,
-            title: description,
-        },
-    });
-    if (createResult.error)
-        return `Error: ${createResult.error}`;
-    const sessionID = createResult.data.id;
-    // Send the prompt to the agent
-    await ctx.client.session.prompt({
-        path: { id: sessionID },
-        body: {
-            agent: agent,
-            parts: [{ type: "text", text: promptText }],
-        },
-    });
-    // Fetch and return the assistant's response
-    const messagesResult = await ctx.client.session.messages({
-        path: { id: sessionID },
-    });
-    const lastMessage = messagesResult.data
-        ?.filter((m) => m.info.role === "assistant")
-        .pop();
-    const responseText = lastMessage?.parts
-        ?.filter((p) => p.type === "text")
-        .map((p) => p.text)
-        .join("\n") || "No response.";
-    return `${responseText}\n\n<task_metadata>\nsession_id: ${sessionID}\n</task_metadata>`;
-}
+    },
+});
+export const statusCommand = createConductorCommand({
+    name: "status.toml",
+    description: "Displays the current progress of the project",
+    args: {},
+});
+export const revertCommand = createConductorCommand({
+    name: "revert.toml",
+    description: "Reverts previous work",
+    args: {
+        target: tool.schema.string().optional().describe("Target to revert (e.g., 'track <track_id>', 'phase <phase_name>', 'task <task_name>')"),
+    },
+    additionalContext: async (ctx, args) => {
+        return {
+            target: args.target || "",
+        };
+    },
+});
+// Export as functions for backward compatibility
 export function createSetupTool(ctx) {
-    return tool({
-        description: "Scaffolds the project and sets up the Conductor environment",
-        args: {},
-        async execute(args, toolContext) {
-            const { prompt, description } = await loadPrompt("setup.toml");
-            return await executeCommand(ctx, toolContext, prompt, "conductor", description);
-        },
-    });
+    return setupCommand(ctx);
 }
 export function createNewTrackTool(ctx) {
-    return tool({
-        description: "Plans a track, generates track-specific spec documents and updates the tracks file",
-        args: {
-            description: tool.schema.string().optional().describe("Brief description of the track (feature, bug fix, chore, etc.)"),
-        },
-        async execute(args, toolContext) {
-            const trackDescription = args.description || "";
-            const { prompt, description } = await loadPrompt("newTrack.toml", {
-                args: trackDescription,
-            });
-            return await executeCommand(ctx, toolContext, prompt, "conductor", description);
-        },
-    });
+    return newTrackCommand(ctx);
 }
 export function createImplementTool(ctx) {
-    return tool({
-        description: "Executes the tasks defined in the specified track's plan",
-        args: {
-            track_name: tool.schema.string().optional().describe("Name or description of the track to implement"),
-        },
-        async execute(args, toolContext) {
-            const trackName = args.track_name || "";
-            const { prompt, description } = await loadPrompt("implement.toml", {
-                track_name: trackName,
-            });
-            return await executeCommand(ctx, toolContext, prompt, "conductor_implementer", description);
-        },
-    });
+    return implementCommand(ctx);
 }
 export function createStatusTool(ctx) {
-    return tool({
-        description: "Displays the current progress of the project",
-        args: {},
-        async execute(args, toolContext) {
-            const { prompt, description } = await loadPrompt("status.toml");
-            return await executeCommand(ctx, toolContext, prompt, "conductor", description);
-        },
-    });
+    return statusCommand(ctx);
 }
 export function createRevertTool(ctx) {
-    return tool({
-        description: "Reverts previous work",
-        args: {
-            target: tool.schema.string().optional().describe("Target to revert (e.g., 'track <track_id>', 'phase <phase_name>', 'task <task_name>')"),
-        },
-        async execute(args, toolContext) {
-            const target = args.target || "";
-            const { prompt, description } = await loadPrompt("revert.toml", {
-                target: target,
-            });
-            return await executeCommand(ctx, toolContext, prompt, "conductor", description);
-        },
-    });
+    return revertCommand(ctx);
 }

package/dist/utils/commandFactory.d.ts

@@ -0,0 +1,10 @@
+import { type PluginInput } from "@opencode-ai/plugin";
+import { type ToolDefinition } from "@opencode-ai/plugin/tool";
+interface ConductorCommandConfig {
+    name: string;
+    description: string;
+    args: Record<string, any>;
+    additionalContext?: (ctx: PluginInput, args: any) => Promise<Record<string, string>>;
+}
+export declare function createConductorCommand(config: ConductorCommandConfig): (ctx: PluginInput) => ToolDefinition;
+export {};

package/dist/utils/commandFactory.js

@@ -0,0 +1,53 @@
+import { tool } from "@opencode-ai/plugin/tool";
+import { join, dirname } from "path";
+import { readFile } from "fs/promises";
+import { fileURLToPath } from "url";
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+// Helper to load and process prompt templates
+async function loadPrompt(filename, replacements = {}) {
+    const promptPath = join(__dirname, "..", "prompts", filename);
+    try {
+        const content = await readFile(promptPath, "utf-8");
+        const descMatch = content.match(/description\s*=\s*"([^"]+)"/);
+        const description = descMatch ? descMatch[1] : "Conductor Command";
+        const promptMatch = content.match(/prompt\s*=\s*"""([\s\S]*?)"""/);
+        let promptText = promptMatch ? promptMatch[1] : "";
+        if (!promptText)
+            throw new Error(`Could not parse prompt text from ${filename}`);
+        const defaults = {
+            templatesDir: join(dirname(dirname(__dirname)), "templates"),
+        };
+        const finalReplacements = { ...defaults, ...replacements };
+        for (const [key, value] of Object.entries(finalReplacements)) {
+            promptText = promptText.replaceAll(`{{${key}}}`, value || "");
+        }
+        return { prompt: promptText, description: description };
+    }
+    catch (error) {
+        console.error(`[Conductor] Error loading prompt ${filename}:`, error);
+        return {
+            prompt: `SYSTEM ERROR: Failed to load prompt ${filename}`,
+            description: "Error loading command",
+        };
+    }
+}
+export function createConductorCommand(config) {
+    return (ctx) => {
+        return tool({
+            description: config.description,
+            args: config.args,
+            async execute(args) {
+                // Get additional context if provided (this can override/extend args)
+                const additionalContext = config.additionalContext
+                    ? await config.additionalContext(ctx, args)
+                    : {};
+                // Merge additionalContext into replacements
+                // additionalContext takes precedence and can provide custom mappings
+                const replacements = { ...additionalContext };
+                const { prompt } = await loadPrompt(config.name, replacements);
+                return prompt;
+            },
+        });
+    };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-conductor-plugin",
-  "version": "1.22.1",
+  "version": "1.24.0",
   "description": "Conductor plugin for OpenCode",
   "type": "module",
   "repository": "derekbar90/opencode-conductor",
@@ -32,6 +32,9 @@
     "build": "tsc && npm run copy-prompts && npm run copy-templates",
     "copy-prompts": "mkdir -p dist/prompts && cp src/prompts/*.toml src/prompts/*.md dist/prompts/ && mkdir -p dist/prompts/agent && cp src/prompts/agent/*.md dist/prompts/agent/ && mkdir -p dist/prompts/strategies && cp src/prompts/strategies/*.md dist/prompts/strategies/",
     "copy-templates": "mkdir -p dist/templates && cp -r src/templates/* dist/templates/",
+    "test": "vitest",
+    "test:watch": "vitest --watch",
+    "test:coverage": "vitest --coverage",
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
@@ -46,8 +49,10 @@
     "@semantic-release/npm": "^12.0.1",
     "@semantic-release/release-notes-generator": "^14.0.0",
     "@types/node": "^20.0.0",
+    "@vitest/ui": "^2.0.0",
     "semantic-release": "^24.2.1",
-    "typescript": "^5.0.0"
+    "typescript": "^5.0.0",
+    "vitest": "^2.0.0"
   },
   "release": {
     "branches": [