@encoredigitalgroup/opencode 0.1.3 → 0.2.1

package/README.md

@@ -3,11 +3,11 @@
 `@encoredigitalgroup/opencode` adds file pickers for OpenCode planning commands.
 
 The TUI provides `/plan-review`, `/plan-resync`, `/plan-split`, and `/plan-execute` commands. Each command opens a picker for plans in `docs/_planning` and inserts the
-selected plan into the prompt. The server entry expands the selected plan into the matching installed skill prompt.
+selected plan into the prompt. The server entry attaches the matching installed skill to the prompt.
 
 ## Install
 
-Add the package to the `plugin` array in your OpenCode configuration:
+OpenCode v2 loads this package from the `plugins` array. Add an object entry with the package name and its options:
 
 - Use `~/.config/opencode/opencode.json` to enable it for every project.
 - Use `opencode.json` in a project to enable it only there.
@@ -15,38 +15,45 @@ Add the package to the `plugin` array in your OpenCode configuration:
 ```json
 {
   "$schema": "https://opencode.ai/config.json",
-  "plugin": ["@encoredigitalgroup/opencode"]
+  "plugins": [
+    {
+      "package": "@encoredigitalgroup/opencode",
+      "options": {}
+    }
+  ]
 }
 ```
 
-Restart OpenCode after changing the configuration. OpenCode downloads missing npm plugins that appear in the `plugin` array, so you do not need to install this package
-with Bun or npm yourself.
+Restart OpenCode after changing the configuration. OpenCode downloads missing npm plugins that appear in the `plugins` array, so you do not need to install this package
+with Bun or npm yourself. This package supports OpenCode v2 only; replace the legacy `plugin` configuration entry when migrating from OpenCode v1.
 
 The plugin resolves the mapped skills through OpenCode, so those skills can live in any location that OpenCode discovers.
 
 ## Configuration
 
-Pass options as the second item in the `plugin` entry. `planDirectory` is relative to the workspace. `skillMappings` can override any plugin command's installed skill name.
-Unspecified values use the defaults: `docs/_planning` and the command's existing skill name.
+Set `planDirectory` and `skillMappings` in the object's `options` field. `planDirectory` is a non-empty path relative to the workspace. `skillMappings` can override any
+supported command's installed skill name. Unspecified values use the defaults: `docs/_planning` and the command's existing skill name.
 
 ```json
 {
   "$schema": "https://opencode.ai/config.json",
-  "plugin": [
-    [
-      "@encoredigitalgroup/opencode",
-      {
+  "plugins": [
+    {
+      "package": "@encoredigitalgroup/opencode",
+      "options": {
         "planDirectory": "plans",
         "skillMappings": {
           "plan-review": "custom-plan-review",
           "plan-execute": "custom-plan-execute"
         }
       }
-    ]
+    }
   ]
 }
 ```
 
+Launching a picker from an existing session submits to that session. Launching one from the home screen creates and displays a new session before submitting the selected plan.
+
 ## Development
 
 ```sh

package/dist/config/ConfigLoader.d.ts

@@ -1,4 +1,4 @@
-import type { PluginOptions } from "@opencode-ai/plugin";
+import type { PluginOptions } from "@opencode/plugin";
 import { type PluginConfig } from "./ConfigTypes.js";
 /** Loads plugin settings from the OpenCode plugin options. */
 export declare class ConfigLoader {

package/dist/lib/FilePickerCommands.d.ts

@@ -1,4 +1,4 @@
-import type { TuiPluginApi, TuiPromptRef } from "@opencode-ai/plugin/tui";
+import type { Plugin } from "@opencode/plugin/tui";
 import type { PluginConfig } from "../config";
 export type FilePickerOption = {
     argument: string;
@@ -6,14 +6,12 @@ export type FilePickerOption = {
     label: string;
 };
 export type FilePickerCommand = {
-    argumentPlaceholder: string;
     command: string;
     description: string;
     emptyMessage: string;
     excludesPlanningDirectory?(directory: string): boolean;
     matchesSelection(argument: string, filePath: string): boolean;
     options(root: string, excludesPlanningDirectory?: (directory: string) => boolean): FilePickerOption[];
-    retainsSelectedFileInPrompt: boolean;
     skill: string;
     title: string;
 };
@@ -24,13 +22,8 @@ export declare class FilePickerCommands {
     private static isSubPlanSelection;
     private static subPlanOptions;
     static getCommands(config: PluginConfig): readonly FilePickerCommand[];
-    private static findSkill;
-    private static removeSelectedFile;
-    private static expandedSkill;
-    static expand(output: {
-        parts: unknown[];
-    }, template: (skill: string) => Promise<string>, config: PluginConfig): Promise<void>;
-    private static workspaceRoot;
-    private static setPrompt;
-    static register(api: TuiPluginApi, prompt: () => TuiPromptRef | undefined, config: PluginConfig): void;
+    private static toast;
+    private static submit;
+    private static run;
+    static register(context: Plugin.Context, config: PluginConfig): void;
 }

package/dist/lib/FilePickerCommands.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/lib/SkillCommands.d.ts

@@ -1,14 +1,7 @@
 import type { PluginConfig } from "../config";
 export declare class SkillCommands {
-    static getCommands(config: PluginConfig): {
-        "feature-planning": {
-            description: string;
-            skill: string;
-        };
-    };
-    static commandTemplate(skillName: string): string;
-    static getTemplate(serverUrl: URL, directory: string, skillName: string): Promise<string>;
-    static expandCommandTemplate(output: {
-        parts: unknown[];
-    }, template: (skillName: string) => Promise<string>): Promise<void>;
+    static getCommands(config: PluginConfig): Record<"feature-planning", {
+        description: string;
+        skill: string;
+    }>;
 }

package/dist/package.integration.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/server/index.d.ts

@@ -1,3 +1,3 @@
-import type { PluginModule } from "@opencode-ai/plugin";
-declare const plugin: PluginModule;
-export default plugin;
+import { Plugin } from "@opencode/plugin";
+declare const _default: Plugin.Plugin;
+export default _default;

package/dist/server/index.js

@@ -1,4 +1,7 @@
 // @bun
+// src/server/index.ts
+import { Plugin } from "@opencode/plugin";
+
 // src/config/ConfigDefaults.ts
 class ConfigDefaults {
   static getDefaultSkillMappings() {
@@ -113,292 +116,7 @@ class ConfigLoader {
     }
   }
 }
-// src/lib/FilePickerCommands.ts
-import { createComponent } from "@opentui/solid";
-import { readdirSync, statSync } from "fs";
-import { join, resolve } from "path";
-import { pathToFileURL } from "url";
-
-class FilePickerCommands {
-  static isPlanPath(path, planDirectory) {
-    return path.startsWith(`${planDirectory}/`) && path.endsWith("/plan.md") && !path.slice(planDirectory.length + 1, -"/plan.md".length).includes("/") && !/\s/.test(path.slice(planDirectory.length + 1, -"/plan.md".length));
-  }
-  static planOptions(root, planDirectory, excludesPlanningDirectory = () => false) {
-    const planningDirectory = join(root, planDirectory);
-    try {
-      return readdirSync(planningDirectory, { withFileTypes: true }).filter((entry) => {
-        if (!entry.isDirectory()) {
-          return false;
-        }
-        if (excludesPlanningDirectory(join(planningDirectory, entry.name))) {
-          return false;
-        }
-        try {
-          return statSync(join(planningDirectory, entry.name, "plan.md")).isFile();
-        } catch {
-          return false;
-        }
-      }).map((entry) => ({
-        argument: `${planDirectory}/${entry.name}/plan.md`,
-        filePath: `${planDirectory}/${entry.name}/plan.md`,
-        label: entry.name
-      })).sort((left, right) => left.label.localeCompare(right.label));
-    } catch {
-      return [];
-    }
-  }
-  static hasSubPlans(directory) {
-    try {
-      return readdirSync(directory, { withFileTypes: true }).some((entry) => entry.isFile() && /^\d{2}-.+\.md$/.test(entry.name));
-    } catch {
-      return false;
-    }
-  }
-  static isSubPlanSelection(argument, filePath, planDirectory) {
-    return argument.startsWith(`${planDirectory}/`) && !argument.slice(planDirectory.length + 1).includes("/") && !/\s/.test(argument.slice(planDirectory.length + 1)) && filePath.startsWith(`${argument}/`) && filePath !== `${argument}/plan.md` && filePath.endsWith(".md");
-  }
-  static subPlanOptions(root, planDirectory) {
-    const planningDirectory = join(root, planDirectory);
-    try {
-      return readdirSync(planningDirectory, { withFileTypes: true }).filter((entry) => entry.isDirectory()).flatMap((entry) => {
-        const directory = join(planningDirectory, entry.name);
-        try {
-          const subPlan = readdirSync(directory, { withFileTypes: true }).filter((file) => file.isFile() && file.name !== "plan.md" && file.name.endsWith(".md")).map((file) => file.name).sort((left, right) => left.localeCompare(right))[0];
-          return subPlan === undefined ? [] : [{
-            argument: `${planDirectory}/${entry.name}`,
-            filePath: `${planDirectory}/${entry.name}/${subPlan}`,
-            label: entry.name
-          }];
-        } catch {
-          return [];
-        }
-      }).sort((left, right) => left.label.localeCompare(right.label));
-    } catch {
-      return [];
-    }
-  }
-  static getCommands(config) {
-    const { planDirectory, skillMappings } = config;
-    const noPlansMessage = `No plan.md files found in ${planDirectory}.`;
-    const noSubPlansMessage = `No sub-plan files found in ${planDirectory}.`;
-    return [
-      {
-        argumentPlaceholder: "$ARGUMENTS",
-        command: "plan-review",
-        description: "Select a plan to review",
-        emptyMessage: noPlansMessage,
-        matchesSelection: (argument, filePath) => argument === filePath && FilePickerCommands.isPlanPath(argument, planDirectory),
-        options: (root, excludesPlanningDirectory) => FilePickerCommands.planOptions(root, planDirectory, excludesPlanningDirectory),
-        retainsSelectedFileInPrompt: true,
-        skill: skillMappings["plan-review"],
-        title: "Select a plan to review"
-      },
-      {
-        argumentPlaceholder: "$ARGUMENTS",
-        command: "plan-resync",
-        description: "Select a plan to resync",
-        emptyMessage: noPlansMessage,
-        matchesSelection: (argument, filePath) => argument === filePath && FilePickerCommands.isPlanPath(argument, planDirectory),
-        options: (root, excludesPlanningDirectory) => FilePickerCommands.planOptions(root, planDirectory, excludesPlanningDirectory),
-        retainsSelectedFileInPrompt: true,
-        skill: skillMappings["plan-resync"],
-        title: "Select a plan to resync"
-      },
-      {
-        argumentPlaceholder: "$ARGUMENTS",
-        command: "plan-split",
-        description: "Select a plan to split",
-        emptyMessage: noPlansMessage,
-        excludesPlanningDirectory: FilePickerCommands.hasSubPlans,
-        matchesSelection: (argument, filePath) => argument === filePath && FilePickerCommands.isPlanPath(argument, planDirectory),
-        options: (root, excludesPlanningDirectory) => FilePickerCommands.planOptions(root, planDirectory, excludesPlanningDirectory),
-        retainsSelectedFileInPrompt: true,
-        skill: skillMappings["plan-split"],
-        title: "Select a plan to split"
-      },
-      {
-        argumentPlaceholder: "$PLAN_DIR",
-        command: "plan-execute",
-        description: "Select sub-plans to execute",
-        emptyMessage: noSubPlansMessage,
-        matchesSelection: (argument, filePath) => FilePickerCommands.isSubPlanSelection(argument, filePath, planDirectory),
-        options: (root) => FilePickerCommands.subPlanOptions(root, planDirectory),
-        retainsSelectedFileInPrompt: false,
-        skill: skillMappings["plan-execute"],
-        title: "Select sub-plans to execute"
-      }
-    ];
-  }
-  static findSkill(text, parts, config) {
-    const filePaths = parts.flatMap((part) => {
-      if (typeof part !== "object" || part === null || !("type" in part) || part.type !== "file" || !("source" in part)) {
-        return [];
-      }
-      const { source } = part;
-      return typeof source === "object" && source !== null && "type" in source && source.type === "file" && "path" in source && typeof source.path === "string" ? [source.path] : [];
-    });
-    for (const command of FilePickerCommands.getCommands(config)) {
-      const prefix = `/${command.command} @`;
-      if (!text.startsWith(prefix)) {
-        continue;
-      }
-      const argument = text.slice(prefix.length).trim();
-      const filePath = filePaths.find((path) => command.matchesSelection(argument, path));
-      if (argument !== "" && filePath !== undefined) {
-        return {
-          argument,
-          argumentPlaceholder: command.argumentPlaceholder,
-          filePath,
-          retainsSelectedFileInPrompt: command.retainsSelectedFileInPrompt,
-          skill: command.skill
-        };
-      }
-    }
-  }
-  static removeSelectedFile(parts, filePath) {
-    const selectedFileIndex = parts.findIndex((candidate) => {
-      if (typeof candidate !== "object" || candidate === null || !("type" in candidate) || candidate.type !== "file" || !("source" in candidate)) {
-        return false;
-      }
-      const { source } = candidate;
-      return typeof source === "object" && source !== null && "type" in source && source.type === "file" && "path" in source && source.path === filePath;
-    });
-    if (selectedFileIndex !== -1) {
-      parts.splice(selectedFileIndex, 1);
-    }
-  }
-  static expandedSkill(text, parts, commands) {
-    for (const part of parts) {
-      if (typeof part !== "object" || part === null || !("type" in part) || part.type !== "file" || !("source" in part)) {
-        continue;
-      }
-      const { source } = part;
-      if (typeof source !== "object" || source === null || !("type" in source) || source.type !== "file" || !("path" in source) || !("text" in source)) {
-        continue;
-      }
-      const filePath = source.path;
-      if (typeof filePath !== "string" || typeof source.text !== "object" || source.text === null || !("value" in source.text) || typeof source.text.value !== "string" || !source.text.value.startsWith("@")) {
-        continue;
-      }
-      const argument = source.text.value.slice(1);
-      const command = commands.find((candidate) => candidate.matchesSelection(argument, filePath) && text.includes(candidate.argumentPlaceholder));
-      if (command !== undefined) {
-        return {
-          argument,
-          argumentPlaceholder: command.argumentPlaceholder,
-          filePath,
-          retainsSelectedFileInPrompt: command.retainsSelectedFileInPrompt,
-          skill: command.skill
-        };
-      }
-    }
-  }
-  static async expand(output, template, config) {
-    const commands = FilePickerCommands.getCommands(config);
-    for (const part of output.parts) {
-      if (typeof part !== "object" || part === null || !("type" in part) || part.type !== "text" || !("text" in part) || typeof part.text !== "string" || "synthetic" in part && part.synthetic) {
-        continue;
-      }
-      const skill = FilePickerCommands.findSkill(part.text, output.parts, config);
-      if (skill === undefined) {
-        continue;
-      }
-      part.text = (await template(skill.skill)).replaceAll(skill.argumentPlaceholder, `@${skill.argument}`).trim();
-      if (!skill.retainsSelectedFileInPrompt) {
-        FilePickerCommands.removeSelectedFile(output.parts, skill.filePath);
-      }
-      return;
-    }
-    for (const part of output.parts) {
-      if (typeof part !== "object" || part === null || !("type" in part) || part.type !== "text" || !("text" in part) || typeof part.text !== "string" || "synthetic" in part && part.synthetic) {
-        continue;
-      }
-      const skill = FilePickerCommands.expandedSkill(part.text, output.parts, commands);
-      if (skill === undefined) {
-        continue;
-      }
-      part.text = part.text.replaceAll(skill.argumentPlaceholder, `@${skill.argument}`);
-      if (!skill.retainsSelectedFileInPrompt) {
-        FilePickerCommands.removeSelectedFile(output.parts, skill.filePath);
-      }
-      return;
-    }
-  }
-  static workspaceRoot(worktree, directory) {
-    return worktree === "/" ? directory : worktree;
-  }
-  static setPrompt(prompt, root, command, option) {
-    const mention = `@${option.argument}`;
-    const input = `/${command.command} ${mention} `;
-    const start = Bun.stringWidth(`/${command.command} `);
-    prompt.set({
-      input,
-      mode: "normal",
-      parts: [
-        {
-          type: "file",
-          mime: "text/plain",
-          filename: option.filePath,
-          url: pathToFileURL(resolve(root, option.filePath)).href,
-          source: {
-            type: "file",
-            path: option.filePath,
-            text: {
-              start,
-              end: start + Bun.stringWidth(mention),
-              value: mention
-            }
-          }
-        }
-      ]
-    });
-    prompt.focus();
-  }
-  static register(api, prompt, config) {
-    api.keymap.registerLayer({
-      commands: FilePickerCommands.getCommands(config).map((command) => ({
-        name: `encoredigitalgroup-opencode.${command.command}`,
-        title: command.title,
-        category: "Plugin",
-        namespace: "palette",
-        slashName: command.command,
-        run() {
-          const root = FilePickerCommands.workspaceRoot(api.state.path.worktree, api.state.path.directory);
-          const options = command.options(root, command.excludesPlanningDirectory);
-          if (options.length === 0) {
-            api.ui.toast({
-              variant: "warning",
-              message: command.emptyMessage
-            });
-            return;
-          }
-          const DialogSelect = api.ui.DialogSelect;
-          api.ui.dialog.setSize("medium");
-          api.ui.dialog.replace(() => createComponent(DialogSelect, {
-            title: command.title,
-            options: options.map((option) => ({ title: option.label, value: option })),
-            onSelect: (option) => {
-              api.ui.dialog.clear();
-              const promptRef = prompt();
-              if (promptRef === undefined) {
-                api.ui.toast({
-                  variant: "error",
-                  message: "The prompt is not ready."
-                });
-                return;
-              }
-              FilePickerCommands.setPrompt(promptRef, root, command, option.value);
-            }
-          }));
-        }
-      }))
-    });
-  }
-}
-
 // src/lib/SkillCommands.ts
-var skillMarker = "<encoredigitalgroup-opencode-skill:";
-
 class SkillCommands {
   static getCommands(config) {
     return {
@@ -408,61 +126,37 @@ class SkillCommands {
       }
     };
   }
-  static commandTemplate(skillName) {
-    return `${skillMarker}${skillName}>`;
-  }
-  static async getTemplate(serverUrl, directory, skillName) {
-    const url = new URL("/api/skill", serverUrl);
-    url.searchParams.set("directory", directory);
-    url.searchParams.set("location[directory]", directory);
-    const response = await fetch(url);
-    if (!response.ok) {
-      throw new Error(`Unable to list OpenCode skills: ${response.status} ${response.statusText}`);
-    }
-    const responseBody = await response.json();
-    const skills = typeof responseBody === "object" && responseBody !== null && "data" in responseBody && Array.isArray(responseBody.data) ? responseBody.data.filter((value) => typeof value === "object" && value !== null && ("content" in value) && typeof value.content === "string" && ("name" in value) && typeof value.name === "string") : [];
-    const skill = skills.find((candidate) => candidate.name === skillName);
-    if (skill === undefined) {
-      throw new Error(`OpenCode skill "${skillName}" is not available.`);
-    }
-    return skill.content;
-  }
-  static async expandCommandTemplate(output, template) {
-    for (const part of output.parts) {
-      if (typeof part !== "object" || part === null || !("type" in part) || part.type !== "text" || !("text" in part) || typeof part.text !== "string" || !part.text.startsWith(skillMarker) || !part.text.endsWith(">")) {
-        continue;
-      }
-      const skillName = part.text.slice(skillMarker.length, -1);
-      part.text = await template(skillName);
-      return;
-    }
-  }
 }
 
 // src/server/index.ts
-var plugin = {
-  id: "encoredigitalgroup-opencode",
-  server: async (input, options) => {
-    const pluginConfig = ConfigLoader.loadConfig(options);
-    const template = (skill) => SkillCommands.getTemplate(input.serverUrl, input.directory, skill);
-    return {
-      config: async (config) => {
-        config.command ??= {};
-        for (const [command, route] of Object.entries(SkillCommands.getCommands(pluginConfig))) {
-          config.command[command] = {
-            description: route.description,
-            template: SkillCommands.commandTemplate(route.skill)
-          };
+var server_default = Plugin.define({
+  id: "@encoredigitalgroup/opencode",
+  async setup(ctx) {
+    const pluginConfig = ConfigLoader.loadConfig(ctx.options);
+    const command = "feature-planning";
+    const route = SkillCommands.getCommands(pluginConfig)[command];
+    const registration = await ctx.command.transform((commands) => {
+      commands.add({
+        name: command,
+        description: route.description,
+        execute: async (input) => {
+          const skills = await ctx.skill.list();
+          const skill = skills.data.find((candidate) => candidate.name === route.skill);
+          if (skill === undefined) {
+            throw new Error(`OpenCode skill "${route.skill}" is not available for /${command}.`);
+          }
+          await ctx.session.prompt({
+            sessionID: input.sessionID,
+            ...input.prompt,
+            skills: [...input.prompt.skills ?? [], { id: skill.id }],
+            delivery: input.delivery
+          });
         }
-      },
-      "chat.message": async (_input, output) => {
-        await SkillCommands.expandCommandTemplate(output, template);
-        await FilePickerCommands.expand(output, template, pluginConfig);
-      }
-    };
+      });
+    });
+    return registration.dispose;
   }
-};
-var server_default = plugin;
+});
 export {
   server_default as default
 };

package/dist/server/index.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/tui/index.d.ts

@@ -1,3 +1,3 @@
-import type { TuiPluginModule } from "@opencode-ai/plugin/tui";
-declare const plugin: TuiPluginModule;
-export default plugin;
+import { Plugin } from "@opencode/plugin/tui";
+declare const _default: Plugin.Definition;
+export default _default;

package/dist/tui/index.js

@@ -1,4 +1,7 @@
 // @bun
+// src/tui/index.tsx
+import { Plugin } from "@opencode/plugin/tui";
+
 // src/config/ConfigDefaults.ts
 class ConfigDefaults {
   static getDefaultSkillMappings() {
@@ -114,7 +117,6 @@ class ConfigLoader {
   }
 }
 // src/lib/FilePickerCommands.ts
-import { createComponent } from "@opentui/solid";
 import { readdirSync, statSync } from "fs";
 import { join, resolve } from "path";
 import { pathToFileURL } from "url";
@@ -183,252 +185,149 @@ class FilePickerCommands {
     const noSubPlansMessage = `No sub-plan files found in ${planDirectory}.`;
     return [
       {
-        argumentPlaceholder: "$ARGUMENTS",
         command: "plan-review",
         description: "Select a plan to review",
         emptyMessage: noPlansMessage,
         matchesSelection: (argument, filePath) => argument === filePath && FilePickerCommands.isPlanPath(argument, planDirectory),
         options: (root, excludesPlanningDirectory) => FilePickerCommands.planOptions(root, planDirectory, excludesPlanningDirectory),
-        retainsSelectedFileInPrompt: true,
         skill: skillMappings["plan-review"],
         title: "Select a plan to review"
       },
       {
-        argumentPlaceholder: "$ARGUMENTS",
         command: "plan-resync",
         description: "Select a plan to resync",
         emptyMessage: noPlansMessage,
         matchesSelection: (argument, filePath) => argument === filePath && FilePickerCommands.isPlanPath(argument, planDirectory),
         options: (root, excludesPlanningDirectory) => FilePickerCommands.planOptions(root, planDirectory, excludesPlanningDirectory),
-        retainsSelectedFileInPrompt: true,
         skill: skillMappings["plan-resync"],
         title: "Select a plan to resync"
       },
       {
-        argumentPlaceholder: "$ARGUMENTS",
         command: "plan-split",
         description: "Select a plan to split",
         emptyMessage: noPlansMessage,
         excludesPlanningDirectory: FilePickerCommands.hasSubPlans,
         matchesSelection: (argument, filePath) => argument === filePath && FilePickerCommands.isPlanPath(argument, planDirectory),
         options: (root, excludesPlanningDirectory) => FilePickerCommands.planOptions(root, planDirectory, excludesPlanningDirectory),
-        retainsSelectedFileInPrompt: true,
         skill: skillMappings["plan-split"],
         title: "Select a plan to split"
       },
       {
-        argumentPlaceholder: "$PLAN_DIR",
         command: "plan-execute",
         description: "Select sub-plans to execute",
         emptyMessage: noSubPlansMessage,
         matchesSelection: (argument, filePath) => FilePickerCommands.isSubPlanSelection(argument, filePath, planDirectory),
         options: (root) => FilePickerCommands.subPlanOptions(root, planDirectory),
-        retainsSelectedFileInPrompt: false,
         skill: skillMappings["plan-execute"],
         title: "Select sub-plans to execute"
       }
     ];
   }
-  static findSkill(text, parts, config) {
-    const filePaths = parts.flatMap((part) => {
-      if (typeof part !== "object" || part === null || !("type" in part) || part.type !== "file" || !("source" in part)) {
-        return [];
-      }
-      const { source } = part;
-      return typeof source === "object" && source !== null && "type" in source && source.type === "file" && "path" in source && typeof source.path === "string" ? [source.path] : [];
-    });
-    for (const command of FilePickerCommands.getCommands(config)) {
-      const prefix = `/${command.command} @`;
-      if (!text.startsWith(prefix)) {
-        continue;
-      }
-      const argument = text.slice(prefix.length).trim();
-      const filePath = filePaths.find((path) => command.matchesSelection(argument, path));
-      if (argument !== "" && filePath !== undefined) {
-        return {
-          argument,
-          argumentPlaceholder: command.argumentPlaceholder,
-          filePath,
-          retainsSelectedFileInPrompt: command.retainsSelectedFileInPrompt,
-          skill: command.skill
-        };
-      }
-    }
+  static toast(context, message) {
+    context.ui.toast.show({ message, variant: "error" });
   }
-  static removeSelectedFile(parts, filePath) {
-    const selectedFileIndex = parts.findIndex((candidate) => {
-      if (typeof candidate !== "object" || candidate === null || !("type" in candidate) || candidate.type !== "file" || !("source" in candidate)) {
-        return false;
+  static async submit(context, location, command, option) {
+    let skills;
+    try {
+      skills = context.data.location.skill.list(location);
+      if (skills === undefined) {
+        await context.data.location.skill.sync(location);
+        skills = context.data.location.skill.list(location);
       }
-      const { source } = candidate;
-      return typeof source === "object" && source !== null && "type" in source && source.type === "file" && "path" in source && source.path === filePath;
-    });
-    if (selectedFileIndex !== -1) {
-      parts.splice(selectedFileIndex, 1);
+    } catch {
+      skills = undefined;
     }
-  }
-  static expandedSkill(text, parts, commands) {
-    for (const part of parts) {
-      if (typeof part !== "object" || part === null || !("type" in part) || part.type !== "file" || !("source" in part)) {
-        continue;
-      }
-      const { source } = part;
-      if (typeof source !== "object" || source === null || !("type" in source) || source.type !== "file" || !("path" in source) || !("text" in source)) {
-        continue;
-      }
-      const filePath = source.path;
-      if (typeof filePath !== "string" || typeof source.text !== "object" || source.text === null || !("value" in source.text) || typeof source.text.value !== "string" || !source.text.value.startsWith("@")) {
-        continue;
+    const skill = skills?.find((candidate) => candidate.name === command.skill);
+    if (skill === undefined) {
+      FilePickerCommands.toast(context, `The configured skill "${command.skill}" is not available.`);
+      return;
+    }
+    let sessionID;
+    const route = context.ui.router.current();
+    if (route.type === "session") {
+      sessionID = route.sessionID;
+    } else {
+      let session;
+      try {
+        session = await context.client.session.create({ location: { directory: location.directory } });
+      } catch {
+        FilePickerCommands.toast(context, "Unable to create a session for the plan request.");
+        return;
       }
-      const argument = source.text.value.slice(1);
-      const command = commands.find((candidate) => candidate.matchesSelection(argument, filePath) && text.includes(candidate.argumentPlaceholder));
-      if (command !== undefined) {
-        return {
-          argument,
-          argumentPlaceholder: command.argumentPlaceholder,
-          filePath,
-          retainsSelectedFileInPrompt: command.retainsSelectedFileInPrompt,
-          skill: command.skill
-        };
+      sessionID = session.id;
+      if (!context.ui.tabs.focus(sessionID)) {
+        context.ui.router.navigate({ type: "session", sessionID });
       }
     }
+    const prompt = {
+      sessionID,
+      text: option.argument,
+      ...command.command === "plan-execute" ? {} : {
+        files: [{ uri: pathToFileURL(resolve(location.directory, option.filePath)).href, name: option.filePath }]
+      },
+      skills: [{ id: skill.id }]
+    };
+    try {
+      await context.client.session.prompt(prompt);
+    } catch {
+      FilePickerCommands.toast(context, "Unable to submit the plan request.");
+    }
   }
-  static async expand(output, template, config) {
-    const commands = FilePickerCommands.getCommands(config);
-    for (const part of output.parts) {
-      if (typeof part !== "object" || part === null || !("type" in part) || part.type !== "text" || !("text" in part) || typeof part.text !== "string" || "synthetic" in part && part.synthetic) {
-        continue;
-      }
-      const skill = FilePickerCommands.findSkill(part.text, output.parts, config);
-      if (skill === undefined) {
-        continue;
-      }
-      part.text = (await template(skill.skill)).replaceAll(skill.argumentPlaceholder, `@${skill.argument}`).trim();
-      if (!skill.retainsSelectedFileInPrompt) {
-        FilePickerCommands.removeSelectedFile(output.parts, skill.filePath);
-      }
+  static async run(context, command) {
+    const location = context.location ?? context.data.location.default();
+    const options = command.options(location.directory, command.excludesPlanningDirectory);
+    if (options.length === 0) {
+      context.ui.toast.show({ variant: "warning", message: command.emptyMessage });
       return;
     }
-    for (const part of output.parts) {
-      if (typeof part !== "object" || part === null || !("type" in part) || part.type !== "text" || !("text" in part) || typeof part.text !== "string" || "synthetic" in part && part.synthetic) {
-        continue;
-      }
-      const skill = FilePickerCommands.expandedSkill(part.text, output.parts, commands);
-      if (skill === undefined) {
-        continue;
-      }
-      part.text = part.text.replaceAll(skill.argumentPlaceholder, `@${skill.argument}`);
-      if (!skill.retainsSelectedFileInPrompt) {
-        FilePickerCommands.removeSelectedFile(output.parts, skill.filePath);
-      }
+    const option = await context.ui.dialog.select({
+      title: command.title,
+      options: options.map((value) => ({ title: value.label, value }))
+    });
+    if (option === undefined) {
       return;
     }
+    await FilePickerCommands.submit(context, location, command, option);
   }
-  static workspaceRoot(worktree, directory) {
-    return worktree === "/" ? directory : worktree;
-  }
-  static setPrompt(prompt, root, command, option) {
-    const mention = `@${option.argument}`;
-    const input = `/${command.command} ${mention} `;
-    const start = Bun.stringWidth(`/${command.command} `);
-    prompt.set({
-      input,
-      mode: "normal",
-      parts: [
-        {
-          type: "file",
-          mime: "text/plain",
-          filename: option.filePath,
-          url: pathToFileURL(resolve(root, option.filePath)).href,
-          source: {
-            type: "file",
-            path: option.filePath,
-            text: {
-              start,
-              end: start + Bun.stringWidth(mention),
-              value: mention
-            }
-          }
-        }
-      ]
-    });
-    prompt.focus();
-  }
-  static register(api, prompt, config) {
-    api.keymap.registerLayer({
-      commands: FilePickerCommands.getCommands(config).map((command) => ({
-        name: `encoredigitalgroup-opencode.${command.command}`,
-        title: command.title,
-        category: "Plugin",
-        namespace: "palette",
-        slashName: command.command,
-        run() {
-          const root = FilePickerCommands.workspaceRoot(api.state.path.worktree, api.state.path.directory);
-          const options = command.options(root, command.excludesPlanningDirectory);
-          if (options.length === 0) {
-            api.ui.toast({
-              variant: "warning",
-              message: command.emptyMessage
-            });
-            return;
-          }
-          const DialogSelect = api.ui.DialogSelect;
-          api.ui.dialog.setSize("medium");
-          api.ui.dialog.replace(() => createComponent(DialogSelect, {
-            title: command.title,
-            options: options.map((option) => ({ title: option.label, value: option })),
-            onSelect: (option) => {
-              api.ui.dialog.clear();
-              const promptRef = prompt();
-              if (promptRef === undefined) {
-                api.ui.toast({
-                  variant: "error",
-                  message: "The prompt is not ready."
-                });
-                return;
-              }
-              FilePickerCommands.setPrompt(promptRef, root, command, option.value);
-            }
-          }));
-        }
-      }))
-    });
+  static register(context, config) {
+    for (const command of FilePickerCommands.getCommands(config)) {
+      context.keymap.layer(() => ({
+        mode: "global",
+        commands: [{
+          id: `@encoredigitalgroup/opencode.${command.command}`,
+          title: command.title,
+          description: command.description,
+          group: "Plugin",
+          palette: true,
+          slash: {
+            name: command.command,
+            arguments: true
+          },
+          run: () => FilePickerCommands.run(context, command)
+        }]
+      }));
+    }
   }
 }
 
 // src/tui/index.tsx
-import { jsx } from "@opentui/solid/jsx-runtime";
-var plugin = {
-  id: "encoredigitalgroup-opencode",
-  tui: async (api, options) => {
-    let prompt;
-    const Prompt = api.ui.Prompt;
-    const capturePrompt = (value, ref) => {
-      prompt = value;
-      ref?.(value);
-    };
-    api.slots.register({
-      slots: {
-        home_prompt(_context, props) {
-          return /* @__PURE__ */ jsx(Prompt, {
-            ref: (value) => capturePrompt(value, props.ref)
-          });
-        },
-        session_prompt(_context, props) {
-          return /* @__PURE__ */ jsx(Prompt, {
-            sessionID: props.session_id,
-            visible: props.visible,
-            disabled: props.disabled,
-            onSubmit: props.on_submit,
-            ref: (value) => capturePrompt(value, props.ref)
-          });
-        }
-      }
+import { jsx, Fragment } from "@opentui/solid/jsx-runtime";
+function PickerCommandLayer(props) {
+  FilePickerCommands.register(props.context, props.config);
+  return /* @__PURE__ */ jsx(Fragment, {});
+}
+var tui_default = Plugin.define({
+  id: "@encoredigitalgroup/opencode",
+  setup(ctx) {
+    return ctx.ui.slot({
+      append: "app",
+      render: () => /* @__PURE__ */ jsx(PickerCommandLayer, {
+        context: ctx,
+        config: ConfigLoader.loadConfig(ctx.options)
+      })
     });
-    FilePickerCommands.register(api, () => prompt, ConfigLoader.loadConfig(options));
   }
-};
-var tui_default = plugin;
+});
 export {
   tui_default as default
 };

package/dist/tui/index.test.d.ts

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@encoredigitalgroup/opencode",
     "type": "module",
-    "version": "0.1.3",
+    "version": "0.2.1",
     "description": "OpenCode file-picker commands for planning skills.",
     "publishConfig": {
         "access": "public"
@@ -16,21 +16,23 @@
         "bun": ">=1.4.0"
     },
     "dependencies": {
-        "@opentui/solid": "0.4.5",
+        "@opentui/solid": "0.5.14",
         "solid-js": "1.9.12"
     },
     "devDependencies": {
-        "@opencode-ai/plugin": "1.18.29",
-        "@opentui/core": "0.4.5",
-        "@opentui/keymap": "0.4.5",
+        "@opencode/cli": "2.0.22",
+        "@opencode/client": "2.0.22",
+        "@opencode/plugin": "2.0.22",
+        "@opentui/core": "0.5.14",
         "@types/bun": "1.4.0",
         "tsfmt": "^0.3.0-beta9",
         "typescript": "5.8.2"
     },
     "scripts": {
-        "build": "rm -rf dist && bun build src/server/index.ts src/tui/index.tsx --outdir dist --target bun --external '@opencode-ai/plugin' --external '@opencode-ai/plugin/*' --external '@opentui/solid' --external '@opentui/solid/*' && tsc --emitDeclarationOnly",
+        "build": "rm -rf dist && bun build src/server/index.ts src/tui/index.tsx --outdir dist --target bun --external '@opencode/plugin' --external '@opencode/plugin/*' --external '@opentui/solid' --external '@opentui/solid/*' && tsc --emitDeclarationOnly",
         "check": "bun run typecheck && bun run build",
         "pack:check": "bun pm pack --dry-run",
+        "test": "bun test",
         "typecheck": "tsc --noEmit"
     },
     "types": "./dist/server/index.d.ts",
@@ -51,15 +53,20 @@
     },
     "files": [
         "dist",
+        "server.js",
+        "tui.js",
         "README.md",
         "LICENSE.md"
     ],
     "license": "proprietary",
     "peerDependencies": {
-        "@opencode-ai/plugin": "^1.18.29"
+        "@opencode/plugin": "^2.0.22"
     },
     "oc-plugin": [
         "server",
         "tui"
+    ],
+    "trustedDependencies": [
+        "@opencode/cli"
     ]
 }

package/server.js

@@ -0,0 +1 @@
+export {default} from "./dist/server/index.js";

package/tui.js

@@ -0,0 +1 @@
+export {default} from "./dist/tui/index.js";