@cortexkit/aft-opencode 0.2.0 → 0.4.1

package/dist/tools/structure.js

@@ -1,4 +1,5 @@
 import { tool } from "@opencode-ai/plugin";
+import { askEditPermission, permissionDeniedResponse, resolveAbsolutePath, resolveRelativePattern, } from "./permissions.js";
 const z = tool.schema;
 /**
  * Tool definitions for scope-aware structure commands:
@@ -7,29 +8,41 @@ const z = tool.schema;
 export function structureTools(ctx) {
     return {
         aft_transform: {
-            description: "Scope-aware structural code transformations with correct indentation.\n" +
+            description: "Scope-aware structural code transformations with correct indentation.\n\n" +
+                "Language-specific: add_derive (Rust), add_struct_tags (Go), add_decorator (Python), wrap_try_catch (TS/JS), add_member (any language).\n\n" +
                 "Ops:\n" +
-                "- 'add_member': Insert method/field into class, struct, or impl block. Needs 'scope' (target container) and 'code'. Optional 'position' (first/last/before:name/after:name).\n" +
-                "- 'add_derive': Add Rust derive macros to struct/enum. Needs 'target' and 'derives' array. Deduplicates.\n" +
-                "- 'wrap_try_catch': Wrap a TS/JS function body in try/catch. Needs 'target' (function name). Optional 'catch_body'.\n" +
-                "- 'add_decorator': Add Python decorator to function/class. Needs 'target' and 'decorator' (without @). Optional 'position' (first/last).\n" +
-                "- 'add_struct_tags': Add/update Go struct field tags. Needs 'target' (struct), 'field', 'tag', 'value'.\n" +
-                "All ops need 'file'. Returns formatted, validation_errors.",
+                "- 'add_member': Insert method/field into class, struct, or impl block. Requires 'container' (container name) and 'code'. Optional 'position'.\n" +
+                "- 'add_derive': Add Rust derive macros to a struct/enum. Requires 'target' and 'derives' array. Deduplicates existing derives.\n" +
+                "- 'wrap_try_catch': Wrap a TS/JS function body in try/catch. Requires 'target' (function name). Optional 'catchBody'.\n" +
+                "- 'add_decorator': Add Python decorator to function/class. Requires 'target' and 'decorator' (without @). Optional 'position'.\n" +
+                "- 'add_struct_tags': Add/update Go struct field tags. Requires 'target' (struct name), 'field', 'tag', 'value'.\n\n" +
+                "Each op requires specific parameters — see parameter descriptions for requirements.\n\n" +
+                "Returns:\n" +
+                "- Dry run (any op): { ok, dry_run, diff, syntax_valid? }\n" +
+                "- add_member: { file, scope, position, formatted, syntax_valid?, format_skipped_reason?, validation_errors?, validate_skipped_reason?, backup_id?, lsp_diagnostics? }\n" +
+                "- add_derive: { file, target, derives, formatted, syntax_valid?, format_skipped_reason?, validation_errors?, validate_skipped_reason?, backup_id?, lsp_diagnostics? }\n" +
+                "- wrap_try_catch: { file, target, formatted, syntax_valid?, format_skipped_reason?, validation_errors?, validate_skipped_reason?, backup_id?, lsp_diagnostics? }\n" +
+                "- add_decorator: { file, target, decorator, formatted, syntax_valid?, format_skipped_reason?, validation_errors?, validate_skipped_reason?, backup_id?, lsp_diagnostics? }\n" +
+                "- add_struct_tags: { file, target, field, tag_string, formatted, syntax_valid?, format_skipped_reason?, validation_errors?, validate_skipped_reason?, backup_id?, lsp_diagnostics? }",
+            // Parameters are Zod-optional because different ops need different subsets.
+            // Runtime guards below validate per-op requirements and give clear errors.
             args: {
                 op: z
                     .enum(["add_member", "add_derive", "wrap_try_catch", "add_decorator", "add_struct_tags"])
                     .describe("Transformation operation"),
-                file: z.string().describe("Path to the source file"),
+                filePath: z
+                    .string()
+                    .describe("Path to the source file (absolute or relative to project root)"),
                 // add_member
-                scope: z
+                container: z
                     .string()
                     .optional()
-                    .describe("Container name to insert into (add_member — class, struct, or impl block)"),
+                    .describe("Container name for add_member — the class, struct, or impl block to insert into. Appears as 'scope' in the response."),
                 code: z.string().optional().describe("Member code to insert (add_member)"),
                 position: z
                     .string()
                     .optional()
-                    .describe("Insert position: 'first', 'last' (default), 'before:name', 'after:name' (add_member, add_decorator)"),
+                    .describe("For add_member: 'first', 'last' (default), 'before:name', 'after:name'. For add_decorator: 'first' (default) or 'last' only."),
                 // add_derive, wrap_try_catch, add_decorator, add_struct_tags
                 target: z
                     .string()
@@ -39,7 +52,7 @@ export function structureTools(ctx) {
                     .array(z.string())
                     .optional()
                     .describe("Derive macro names (add_derive — e.g. ['Clone', 'Debug'])"),
-                catch_body: z
+                catchBody: z
                     .string()
                     .optional()
                     .describe("Catch block body (wrap_try_catch — default: 'throw error;')"),
@@ -58,20 +71,57 @@ export function structureTools(ctx) {
                 validate: z
                     .enum(["syntax", "full"])
                     .optional()
-                    .describe("Validation level: 'syntax' (default) or 'full'"),
-                dry_run: z.boolean().optional().describe("Preview without modifying the file"),
+                    .describe("Validation level: 'syntax' (default) or 'full'. Syntax = tree-sitter parse check only. Full = also runs LSP type-checking (slower, catches more errors)"),
+                dryRun: z
+                    .boolean()
+                    .optional()
+                    .describe("Preview without modifying the file (default: false)"),
             },
             execute: async (args, context) => {
                 const bridge = ctx.pool.getBridge(context.directory);
                 const op = args.op;
-                const params = { file: args.file };
+                const isDryRun = args.dryRun === true;
+                if (op === "add_member") {
+                    if (typeof args.container !== "string")
+                        throw new Error("'container' is required for 'add_member' op");
+                    if (typeof args.code !== "string")
+                        throw new Error("'code' is required for 'add_member' op");
+                }
+                if (op === "add_derive" ||
+                    op === "wrap_try_catch" ||
+                    op === "add_decorator" ||
+                    op === "add_struct_tags") {
+                    if (typeof args.target !== "string")
+                        throw new Error(`'target' is required for '${op}' op`);
+                }
+                if (op === "add_derive" && !Array.isArray(args.derives)) {
+                    throw new Error("'derives' array is required for 'add_derive' op");
+                }
+                if (op === "add_decorator" && typeof args.decorator !== "string") {
+                    throw new Error("'decorator' is required for 'add_decorator' op");
+                }
+                if (op === "add_struct_tags") {
+                    if (typeof args.field !== "string")
+                        throw new Error("'field' is required for 'add_struct_tags' op");
+                    if (typeof args.tag !== "string")
+                        throw new Error("'tag' is required for 'add_struct_tags' op");
+                    if (typeof args.value !== "string")
+                        throw new Error("'value' is required for 'add_struct_tags' op");
+                }
+                if (!isDryRun) {
+                    const filePath = resolveAbsolutePath(context, args.filePath);
+                    const permissionError = await askEditPermission(context, [resolveRelativePattern(context, args.filePath)], { filepath: filePath });
+                    if (permissionError)
+                        return permissionDeniedResponse(permissionError);
+                }
+                const params = { file: args.filePath };
                 if (args.validate !== undefined)
                     params.validate = args.validate;
-                if (args.dry_run !== undefined)
-                    params.dry_run = args.dry_run;
+                if (args.dryRun !== undefined)
+                    params.dry_run = args.dryRun;
                 switch (op) {
                     case "add_member":
-                        params.scope = args.scope;
+                        params.scope = args.container;
                         params.code = args.code;
                         if (args.position !== undefined)
                             params.position = args.position;
@@ -82,8 +132,8 @@ export function structureTools(ctx) {
                         break;
                     case "wrap_try_catch":
                         params.target = args.target;
-                        if (args.catch_body !== undefined)
-                            params.catch_body = args.catch_body;
+                        if (args.catchBody !== undefined)
+                            params.catch_body = args.catchBody;
                         break;
                     case "add_decorator":
                         params.target = args.target;

package/dist/tools/structure.js.map

@@ -1 +1 @@
-{"version":3,"file":"structure.js","sourceRoot":"","sources":["../../src/tools/structure.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"structure.js","sourceRoot":"","sources":["../../src/tools/structure.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@cortexkit/aft-opencode",
-  "version": "0.2.0",
+  "version": "0.4.1",
   "type": "module",
-  "description": "OpenCode plugin for Agent File Tools (AFT) — tree-sitter powered code analysis",
+  "description": "OpenCode plugin for Agent File Tools (AFT) — tree-sitter and lsp powered code analysis",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "license": "MIT",
@@ -27,11 +27,11 @@
     "zod": "^4.1.8"
   },
   "optionalDependencies": {
-    "@cortexkit/aft-darwin-arm64": "0.2.0",
-    "@cortexkit/aft-darwin-x64": "0.2.0",
-    "@cortexkit/aft-linux-arm64": "0.2.0",
-    "@cortexkit/aft-linux-x64": "0.2.0",
-    "@cortexkit/aft-win32-x64": "0.2.0"
+    "@cortexkit/aft-darwin-arm64": "0.4.1",
+    "@cortexkit/aft-darwin-x64": "0.4.1",
+    "@cortexkit/aft-linux-arm64": "0.4.1",
+    "@cortexkit/aft-linux-x64": "0.4.1",
+    "@cortexkit/aft-win32-x64": "0.4.1"
   },
   "devDependencies": {
     "@types/node": "^22.0.0",

package/dist/tools/editing.d.ts

@@ -1,7 +0,0 @@
-import type { ToolDefinition } from "@opencode-ai/plugin";
-import type { PluginContext } from "../types.js";
-/**
- * Tool definitions for code editing commands: write, edit_symbol, edit_match, batch.
- */
-export declare function editingTools(ctx: PluginContext): Record<string, ToolDefinition>;
-//# sourceMappingURL=editing.d.ts.map

package/dist/tools/editing.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"editing.d.ts","sourceRoot":"","sources":["../../src/tools/editing.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAG1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAsBjD;;GAEG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAgI/E"}

package/dist/tools/editing.js

@@ -1,150 +0,0 @@
-import { tool } from "@opencode-ai/plugin";
-import { queryLspHints } from "../lsp.js";
-const z = tool.schema;
-/** Valid operations for edit_symbol. */
-const editOperationEnum = z
-    .enum(["replace", "delete", "insert_before", "insert_after"])
-    .describe("The edit operation to perform on the symbol");
-/** Schema for a single batch edit item — either match-replace or line-range. */
-const batchEditItem = z.union([
-    z.object({
-        match: z.string().describe("Text pattern to find and replace"),
-        replacement: z.string().describe("Replacement text"),
-    }),
-    z.object({
-        line_start: z.number().describe("Start line number (1-indexed)"),
-        line_end: z.number().describe("End line number (1-indexed, inclusive)"),
-        content: z.string().describe("Content to replace the line range with"),
-    }),
-]);
-/**
- * Tool definitions for code editing commands: write, edit_symbol, edit_match, batch.
- */
-export function editingTools(ctx) {
-    return {
-        aft_edit: {
-            description: "Edit files with tree-sitter precision. All modes auto-backup before changes and support dry_run.\n" +
-                "Modes:\n" +
-                "- 'symbol': Edit a named symbol (function, class, type) — preferred for code changes. Needs 'symbol', 'operation' (replace/delete/insert_before/insert_after), and 'content'. Response includes context_before/context_after (3 lines each) to detect duplication.\n" +
-                "- 'match': Find and replace text by content match — use for config values, strings, unnamed code. Needs 'match', 'replacement'. Set replace_all=true to replace ALL occurrences at once. Returns ambiguous_match if multiple hits without occurrence or replace_all. For multi-line matching, use actual newlines in the JSON string value. Supports glob patterns in 'file' (e.g. '**/*.ts') to replace across multiple files at once — returns {files: [...], total_replacements, total_files}.\n" +
-                "- 'write': Write full file content — for new files or complete rewrites. Needs 'content'.\n" +
-                "- 'batch': Multiple edits in one file atomically — each edit is {match, replacement} or {line_start, line_end, content} (1-based, inclusive). Supports per-edit 'occurrence' for disambiguation. Set content to empty string to delete lines entirely. line_start == total_lines+1 appends at EOF. line_end is auto-clamped to last line (safe to overshoot).\n" +
-                "- 'transaction': Atomic multi-file edits with rollback — if any file fails, all revert. Needs 'operations' array of {file, command, ...}.\n" +
-                "Returns formatted, validation_errors, backup_id.",
-            args: {
-                mode: z.enum(["symbol", "match", "write", "batch", "transaction"]).describe("Editing mode"),
-                file: z
-                    .string()
-                    .optional()
-                    .describe("Path to the file (required for all modes except transaction)"),
-                // symbol mode
-                symbol: z.string().optional().describe("Symbol name to edit (symbol mode)"),
-                operation: editOperationEnum.optional().describe("Edit operation (symbol mode)"),
-                scope: z
-                    .string()
-                    .optional()
-                    .describe("Qualified scope for disambiguation (e.g. 'ClassName.method')"),
-                // match mode
-                match: z.string().optional().describe("Text to find (match mode)"),
-                replacement: z.string().optional().describe("Replacement text (match mode)"),
-                occurrence: z
-                    .number()
-                    .describe("Zero-based index selecting which occurrence to replace when multiple matches exist (0 = first, 1 = second, etc). Use with ambiguous_match response. (match mode)"),
-                replace_all: z
-                    .boolean()
-                    .optional()
-                    .describe("Replace ALL occurrences instead of disambiguating (match mode, default: false)"),
-                // write + symbol content
-                content: z
-                    .string()
-                    .optional()
-                    .describe("New content (write mode: full file, symbol mode: replacement body)"),
-                create_dirs: z
-                    .boolean()
-                    .optional()
-                    .describe("Create parent directories (write mode, default: false)"),
-                // batch mode
-                edits: z
-                    .array(batchEditItem)
-                    .optional()
-                    .describe("Array of edits to apply atomically (batch mode)"),
-                // transaction mode
-                operations: z
-                    .array(z.object({
-                    file: z.string().describe("File path"),
-                    command: z.enum(["write", "edit_match"]).describe("Operation type"),
-                    content: z.string().optional().describe("Full content for write"),
-                    match: z.string().optional().describe("Text to find for edit_match"),
-                    replacement: z.string().optional().describe("Replacement for edit_match"),
-                }))
-                    .optional()
-                    .describe("Array of file operations (transaction mode)"),
-                // common
-                validate: z
-                    .enum(["syntax", "full"])
-                    .optional()
-                    .describe("Validation level: 'syntax' (default) or 'full'"),
-                dry_run: z.boolean().optional().describe("Preview as unified diff without modifying files"),
-            },
-            execute: async (args, context) => {
-                const bridge = ctx.pool.getBridge(context.directory);
-                const mode = args.mode;
-                const params = {};
-                if (args.file !== undefined)
-                    params.file = args.file;
-                if (args.validate !== undefined)
-                    params.validate = args.validate;
-                if (args.dry_run !== undefined)
-                    params.dry_run = args.dry_run;
-                let command;
-                switch (mode) {
-                    case "symbol": {
-                        command = "edit_symbol";
-                        params.symbol = args.symbol;
-                        params.operation = args.operation;
-                        if (args.content !== undefined)
-                            params.content = args.content;
-                        if (args.scope !== undefined)
-                            params.scope = args.scope;
-                        const hints = await queryLspHints(ctx.client, args.symbol);
-                        if (hints)
-                            params.lsp_hints = hints;
-                        break;
-                    }
-                    case "match": {
-                        command = "edit_match";
-                        params.match = args.match;
-                        params.replacement = args.replacement;
-                        if (args.occurrence !== undefined)
-                            params.occurrence = Number(args.occurrence);
-                        if (args.replace_all !== undefined)
-                            params.replace_all = args.replace_all;
-                        break;
-                    }
-                    case "write": {
-                        command = "write";
-                        params.content = args.content;
-                        if (args.create_dirs !== undefined)
-                            params.create_dirs = args.create_dirs;
-                        break;
-                    }
-                    case "batch": {
-                        command = "batch";
-                        params.edits = args.edits;
-                        break;
-                    }
-                    case "transaction": {
-                        command = "transaction";
-                        params.operations = args.operations;
-                        break;
-                    }
-                    default:
-                        command = mode;
-                }
-                const response = await bridge.send(command, params);
-                return JSON.stringify(response);
-            },
-        },
-    };
-}
-//# sourceMappingURL=editing.js.map

package/dist/tools/editing.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"editing.js","sourceRoot":"","sources":["../../src/tools/editing.ts"],"names":[],"mappings":"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"}