opencode-gitwt 0.2.0 → 0.2.2

package/README.md

@@ -37,17 +37,9 @@ change the session directory. Use `gitwt_list` to inspect copies and
 
 ## Configuration
 
-The plugin uses the shared gitwt configuration: `.gitwt.jsonc` in the project
-and `~/.config/gitwt/config.jsonc` globally. Options include `remote`, `base`,
+The plugin uses plain JSON: `.gitwt.json` in the project
+and `~/.config/gitwt/config.json` globally. Options include `remote`, `base`,
 `prefix`, `worktreeDir`, and `hooks`. See the core repository for details.
 
 For the standalone `gitwt` command, run `npm install -g @voischev/gitwt`.
-Upgrading from 0.1.x: move `.opencode/gitwt.jsonc` to `.gitwt.jsonc` and global
-settings from `~/.config/opencode/gitwt.jsonc` to `~/.config/gitwt/config.jsonc`.
-
-## Development
-
-GitHub is the primary repository; SourceCraft is a mirror. Releases publish to
-npm from GitHub with `NPM_TOKEN`.
-
-Run `npm ci --ignore-scripts`, `npm run check`, and `npm test`.
+Move existing settings to these paths and remove comments and trailing commas.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "opencode-gitwt",
-  "version": "0.2.0",
-  "description": "Git worktree для OpenCode: создать, проверить, вернуть путь и явно удалить",
+  "version": "0.2.2",
+  "description": "Git worktree tools for OpenCode, powered by gitwt",
   "type": "module",
   "main": "./src/index.js",
   "exports": {
@@ -23,8 +23,7 @@
     "release": "node scripts/release.js"
   },
   "dependencies": {
-    "@voischev/gitwt": "^0.1.3",
-    "zod": "4.1.8"
+    "@voischev/gitwt": "^0.1.4"
   },
   "devDependencies": {
     "@biomejs/biome": "2.6.3"

package/src/index.js

@@ -1,64 +1,103 @@
-import { createWorktree, listWorktrees, removeWorktree, resolveWorktree } from "@voischev/gitwt";
-import { z } from "zod";
+import {
+  createWorktree,
+  GitwtError,
+  listWorktrees,
+  removeWorktree,
+  resolveWorktree,
+} from "@voischev/gitwt";
 
 export async function GitwtPlugin({ directory }, config = {}) {
-  return {
-    tool: {
-      gitwt_create: {
-        description:
-          "Создать и проверить новый worktree. Продолжайте текущую сессию, используя возвращённый worktreePath в командах и файловых операциях. Сохраняйте worktree при паузе и передаче задачи.",
-        args: {
-          branch: z.string().describe("Имя новой ветки"),
-          base: z.string().optional().describe("Базовая remote-ветка"),
-          from: z
-            .string()
-            .optional()
-            .describe("Явная локальная ссылка или проверенный commit вместо remote-базы"),
-          path: z.string().optional().describe("Полный путь нового worktree"),
-          noHooks: z.boolean().optional().describe("Явно отключить хуки для создаваемого worktree"),
+  const tool = {
+    gitwt_create: {
+      description:
+        "Create and verify a new worktree. Use worktreePath for commands and files in the current session. Keep the worktree when pausing or handing off a task.",
+      args: {
+        branch: { type: "string", description: "New branch name" },
+        base: { type: "string", description: "Remote base branch" },
+        from: {
+          type: "string",
+          description: "Local ref or verified commit instead of a remote base",
         },
-        execute: async (args, ctx) =>
-          JSON.stringify(
-            await createWorktree(ctx.directory ?? directory, {
-              ...args,
-              signal: ctx.abort,
-              config: { ...config, base: args.base ?? config.base },
-            }),
-          ),
-      },
-      gitwt_list: {
-        description:
-          "Показать worktree из реестра Git. status проверяет dirty и доступные ahead/behind; null означает неизвестное состояние.",
-        args: { status: z.boolean().optional() },
-        execute: async (args, ctx) =>
-          JSON.stringify(await listWorktrees(ctx.directory ?? directory, args)),
-      },
-      gitwt_cd: {
-        description:
-          "Найти worktree по точной ветке или полному пути и вернуть его путь, HEAD и статус. Каталог текущей сессии не меняется: используйте worktreePath явно.",
-        args: { target: z.string() },
-        execute: async ({ target }, ctx) =>
-          JSON.stringify(
-            await resolveWorktree(ctx.directory ?? directory, target, { status: true }),
-          ),
+        path: { type: "string", description: "Destination path" },
+        noHooks: { type: "boolean", description: "Disable hooks for this worktree" },
       },
-      gitwt_remove: {
-        description:
-          "Только по явной просьбе удалить указанный worktree, убедившись, что он больше не используется. force разрешает потерю изменений, но не обходит ошибку preRemove. Без автокоммитов и отложенной очистки.",
-        args: {
-          target: z.string(),
-          force: z.boolean().optional(),
-          keepBranch: z.boolean().optional(),
-        },
-        execute: async ({ target, force, keepBranch }, ctx) =>
-          JSON.stringify(
-            await removeWorktree(ctx.directory ?? directory, target, {
-              force,
-              deleteBranch: !keepBranch,
-              signal: ctx.abort,
-            }),
-          ),
+      execute: async (args, ctx) =>
+        JSON.stringify(
+          await createWorktree(ctx.directory ?? directory, {
+            ...args,
+            signal: ctx.abort,
+            config: { ...config, base: args.base ?? config.base },
+          }),
+        ),
+    },
+    gitwt_list: {
+      description:
+        "List Git worktrees. With status, check dirty and available ahead/behind counts; null means unknown.",
+      args: { status: { type: "boolean", description: "Check live worktree status" } },
+      execute: async (args, ctx) =>
+        JSON.stringify(await listWorktrees(ctx.directory ?? directory, args)),
+    },
+    gitwt_cd: {
+      description:
+        "Resolve a branch or full path to a worktree with HEAD and status. Use worktreePath explicitly; this does not change the session directory.",
+      args: { target: { type: "string", description: "Exact branch name or full worktree path" } },
+      execute: async ({ target }, ctx) =>
+        JSON.stringify(await resolveWorktree(ctx.directory ?? directory, target, { status: true })),
+    },
+    gitwt_remove: {
+      description:
+        "Remove a worktree only when explicitly requested and no longer in use. Force discards local changes but does not bypass a failing preRemove hook.",
+      args: {
+        target: { type: "string", description: "Exact branch name or full worktree path" },
+        force: { type: "boolean", description: "Allow discarding local changes" },
+        keepBranch: { type: "boolean", description: "Keep the branch after removing the worktree" },
       },
+      execute: async ({ target, force, keepBranch }, ctx) =>
+        JSON.stringify(
+          await removeWorktree(ctx.directory ?? directory, target, {
+            force,
+            deleteBranch: !keepBranch,
+            signal: ctx.abort,
+          }),
+        ),
+    },
+  };
+  const required = {
+    gitwt_create: ["branch"],
+    gitwt_list: [],
+    gitwt_cd: ["target"],
+    gitwt_remove: ["target"],
+  };
+  for (const [id, definition] of Object.entries(tool)) {
+    const execute = definition.execute;
+    definition.execute = async (args, ctx) => {
+      if (!args || typeof args !== "object" || Array.isArray(args)) {
+        throw new GitwtError("invalid_arguments", `${id}: expected an argument object`);
+      }
+      for (const key of Object.keys(args)) {
+        if (!Object.hasOwn(definition.args, key)) {
+          throw new GitwtError("invalid_arguments", `${id}: unknown argument ${key}`);
+        }
+      }
+      for (const [key, schema] of Object.entries(definition.args)) {
+        if (args[key] === undefined && !required[id].includes(key)) continue;
+        if (typeof args[key] !== schema.type) {
+          throw new GitwtError("invalid_arguments", `${id}: ${key} must be ${schema.type}`);
+        }
+      }
+      return execute(args, ctx);
+    };
+  }
+  return {
+    tool,
+    "tool.definition": async ({ toolID }, output) => {
+      if (!Object.hasOwn(tool, toolID)) return;
+      output.jsonSchema = {
+        type: "object",
+        properties: tool[toolID].args,
+        required: required[toolID],
+        additionalProperties: false,
+      };
     },
   };
 }