@craftsamo/git-tools 0.2.1 → 0.2.2

package/.antigravity-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "git-tools",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "Git tools for coding agents: state, commits, rewrites and stacked branches, worktrees and pushing.",
   "author": {
     "name": "craftsamo",

package/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "git-tools",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "Git tools for coding agents: state, commits, rewrites and stacked branches, worktrees and pushing.",
   "author": {
     "name": "craftsamo",

package/.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "git-tools",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "Git tools for coding agents: state, commits, rewrites and stacked branches, worktrees and pushing.",
   "author": {
     "name": "craftsamo",

package/README.md

@@ -303,22 +303,26 @@ Where a write is asked about, and where it is not:
 Every entry point takes the same settings. A flag wins over its environment
 variable, and an option or setting wins over the variable too.
 
-| Setting                | Flag                     | Variable                         | Meaning                                                                                                                  |
-| ---------------------- | ------------------------ | -------------------------------- | ------------------------------------------------------------------------------------------------------------------------ |
-| `toolsets`             | `--toolsets`             | `GIT_TOOLS_TOOLSETS`             | the toolsets that are on, or `all`; default those `src/project.ts` names                                                 |
-| `read_only`            | `--read-only`            | `GIT_TOOLS_READ_ONLY`            | registers no tool that writes; wins over every other setting                                                             |
-| `tools`                | `--tools`                | `GIT_TOOLS_TOOLS`                | single tools to add by ID, whatever their toolset                                                                        |
-| `exclude_tools`        | `--exclude-tools`        | `GIT_TOOLS_EXCLUDE_TOOLS`        | single tools to remove by ID; wins over `tools` and `toolsets`                                                           |
-| `confirm`              | `--confirm`              | `GIT_TOOLS_CONFIRM`              | MCP server only: `harness` (default) or `elicitation`, as the conventions say                                            |
-| `language`             | `--language`             | `GIT_TOOLS_LANGUAGE`             | native plugins only: the approval prompt's language, such as `ja`                                                        |
-| `emoji`                | —                        | —                                | Hermes only: the emoji shown beside each toolset, by toolset name (`""` for none)                                        |
-| `published_text_rules` | `--published-text-rules` | `GIT_TOOLS_PUBLISHED_TEXT_RULES` | the absolute path (`~` allowed) of a JSON file of published-text rules (see the push toolset); unset, nothing is checked |
-| `worktree_root`        | `--worktree-root`        | `GIT_TOOLS_WORKTREE_ROOT`        | the absolute path where task worktrees go (`~` allowed); unset, `~/worktrees`                                            |
+| Setting                | Flag                     | Variable                         | Meaning                                                                                           |
+| ---------------------- | ------------------------ | -------------------------------- | ------------------------------------------------------------------------------------------------- |
+| `toolsets`             | `--toolsets`             | `GIT_TOOLS_TOOLSETS`             | the toolsets that are on, or `all`; default those `src/project.ts` names                          |
+| `read_only`            | `--read-only`            | `GIT_TOOLS_READ_ONLY`            | registers no tool that writes; wins over every other setting                                      |
+| `tools`                | `--tools`                | `GIT_TOOLS_TOOLS`                | single tools to add by ID, whatever their toolset                                                 |
+| `exclude_tools`        | `--exclude-tools`        | `GIT_TOOLS_EXCLUDE_TOOLS`        | single tools to remove by ID; wins over `tools` and `toolsets`                                    |
+| `confirm`              | `--confirm`              | `GIT_TOOLS_CONFIRM`              | MCP server only: `harness` (default) or `elicitation`, as the conventions say                     |
+| `language`             | `--language`             | `GIT_TOOLS_LANGUAGE`             | native plugins only: the approval prompt's language, such as `ja`                                 |
+| `emoji`                | —                        | —                                | Hermes only: the emoji shown beside each toolset, by toolset name (`""` for none)                 |
+| `published_text_rules` | `--published-text-rules` | `GIT_TOOLS_PUBLISHED_TEXT_RULES` | the path of a JSON file of published-text rules (see the push toolset); unset, nothing is checked |
+| `worktree_root`        | `--worktree-root`        | `GIT_TOOLS_WORKTREE_ROOT`        | the path where task worktrees go; unset, `~/worktrees`                                            |
 
 Lists are comma-separated in a flag or a variable. A package's own settings,
 listed in `options` in `src/project.ts`, take a row each here and are read the
-same way: `published_text_rules` and `worktree_root` hold text, trimmed and
-blank meaning unset, and the tools read them themselves. The layout is
+same way. A `path` is trimmed; `~` and `~/…` (also with the platform separator)
+stand for the home directory (`HOME` when it is absolute, else the account's).
+It must then be absolute and reaches the tool normalized, without a filesystem
+check. Blank paths count as unset. Refused values are `invalid_argument`, naming
+the flag, variable or option and what it must be. Hermes passes paths to the
+command line, which checks them. The layout is
 `<root>/<repository>/<branch>`, with each `/` of the branch written `-`; the
 repository is the last part of `origin`'s URL without `.git`, else the folder
 name of the main checkout. Where each harness reads them:
@@ -339,7 +343,7 @@ name of the main checkout. Where each harness reads them:
         settings:
           read_only: false
           exclude_tools: []
-          published_text_rules: ~/.config/git-tools/published-text.json
+          published_text_rules: /home/me/.config/git-tools/published-text.json
           worktree_root: ~/worktrees
   ```
 

package/dist/cli.js

@@ -27,7 +27,7 @@ var PROJECT = {
   /** The toolsets on when a setting names none. */
   defaultToolsets: ["repo", "commit", "rebase"],
   /** The package's own settings, which the tools themselves read: each snake_case name and its type, with bounds when it needs them. */
-  options: { published_text_rules: "text", worktree_root: "text" },
+  options: { published_text_rules: "path", worktree_root: "path" },
   /** The environment variables the tools read besides the settings, which Codex forwards to the server after them. */
   toolVariables: [
     "LANGUAGE",
@@ -5135,7 +5135,7 @@ var recursive = /* @__PURE__ */ new WeakMap();
 var NONE = 0;
 var ASSUMED = 1;
 var PROVEN = 2;
-function isRecursive(inst, stack, resolve5) {
+function isRecursive(inst, stack, resolve3) {
   const cached2 = recursive.get(inst);
   if (cached2 !== void 0)
     return cached2 ? PROVEN : NONE;
@@ -5145,7 +5145,7 @@ function isRecursive(inst, stack, resolve5) {
   let result = NONE;
   const check2 = (child) => {
     if (result !== PROVEN && child?._zod) {
-      const answer = isRecursive(child, stack, resolve5);
+      const answer = isRecursive(child, stack, resolve3);
       if (answer > result)
         result = answer;
     }
@@ -5156,7 +5156,7 @@ function isRecursive(inst, stack, resolve5) {
       const desc = Object.getOwnPropertyDescriptor(sh, key);
       if (spread && !desc.enumerable)
         continue;
-      const child = desc.get ? ASSUMED : desc.value?._zod ? isRecursive(desc.value, stack, resolve5) : NONE;
+      const child = desc.get ? ASSUMED : desc.value?._zod ? isRecursive(desc.value, stack, resolve3) : NONE;
       if (child > answer)
         answer = child;
     }
@@ -5220,7 +5220,7 @@ function isRecursive(inst, stack, resolve5) {
       break;
     // `$ZodLazy` caches its inner on the def, so a resolved edge is followed exactly
     case "lazy": {
-      const inner = def._cachedInner ?? (resolve5 ? inst._zod.innerType : void 0);
+      const inner = def._cachedInner ?? (resolve3 ? inst._zod.innerType : void 0);
       merge2(inner ? isRecursive(inner, stack, false) : ASSUMED);
       break;
     }
@@ -19829,7 +19829,7 @@ function abortError(signal) {
 }
 function exec(argv, options) {
   const { signal } = options;
-  return new Promise((resolve5, reject) => {
+  return new Promise((resolve3, reject) => {
     if (signal?.aborted) {
       reject(abortError(signal));
       return;
@@ -19888,7 +19888,7 @@ function exec(argv, options) {
     }
     const finish = () => settle2(() => {
       const { code, killedBy } = exitedWith ?? { code: null, killedBy: null };
-      resolve5({
+      resolve3({
         code: code ?? -1,
         stdout,
         stderr,
@@ -22788,7 +22788,7 @@ async function compareBranch(root, remote, selected, expect, signal) {
 
 // src/core/push/published-text.ts
 import { readFile as readFile2, stat as stat6 } from "node:fs/promises";
-import { isAbsolute as isAbsolute4, resolve as resolve2 } from "node:path";
+import { isAbsolute as isAbsolute4 } from "node:path";
 
 // src/core/describe.ts
 var MAX_FACTS = 8;
@@ -22925,19 +22925,6 @@ async function wholeCallDescription(spec, args, ctx) {
   return { ...headline2 && { headline: headline2 }, facts, ...text && { text }, ...kept2 };
 }
 
-// src/core/home.ts
-import { homedir } from "node:os";
-import { join as join5 } from "node:path";
-var HOME_MARK = "~";
-var HOME_PREFIX = "~/";
-function homeDirectory() {
-  return process.env.HOME?.trim() || homedir();
-}
-function expandHome(value) {
-  if (value === HOME_MARK) return homeDirectory();
-  return value.startsWith(HOME_PREFIX) ? join5(homeDirectory(), value.slice(HOME_PREFIX.length)) : value;
-}
-
 // src/core/push/published-text.ts
 var PUBLISHED_TEXT_RULES_OPTION = "published_text_rules";
 var MAX_FILE_BYTES = 64 * 1024;
@@ -23010,11 +22997,8 @@ async function loadPublishedTextRules(options, signal) {
   const option = options?.[PUBLISHED_TEXT_RULES_OPTION];
   const path = typeof option === "string" ? option.trim() : void 0;
   if (!path) return [];
-  const expanded = expandHome(path);
-  if (!isAbsolute4(expanded))
-    throw invalidRules(path, `the value must be an absolute path, or start with ${HOME_PREFIX}`);
-  const normalized = resolve2(expanded);
-  return compileRules(normalized, parseRulesJson(normalized, await readRulesFile(normalized, signal)));
+  if (!isAbsolute4(path)) throw invalidRules(path, "the value must be an absolute path");
+  return compileRules(path, parseRulesJson(path, await readRulesFile(path, signal)));
 }
 var publishedTextFindingSchema = external_exports.object({
   rule: external_exports.string().describe("The name of the rule that matched."),
@@ -23968,11 +23952,11 @@ var rebaseRead = defineTool({
 // src/core/rebase/resume.ts
 import { createHash as createHash3 } from "node:crypto";
 import { readFile as readFile5 } from "node:fs/promises";
-import { join as join8 } from "node:path";
+import { join as join7 } from "node:path";
 
 // src/core/conflicts.ts
 import { readFile as readFile3 } from "node:fs/promises";
-import { basename as basename2, join as join6 } from "node:path";
+import { basename as basename2, join as join5 } from "node:path";
 var REGION_MAX = 20;
 var SIDE_LINES_MAX = 40;
 var LOCKFILES = {
@@ -24084,7 +24068,7 @@ async function readConflictFile(root, path, xy, operation) {
   }
   let text;
   try {
-    text = await readFile3(join6(root, path), "utf8");
+    text = await readFile3(join5(root, path), "utf8");
   } catch {
     return { ...file2, region_count: 0, regions: [] };
   }
@@ -24167,13 +24151,13 @@ var rebaseOutcomeSchema = external_exports.object({
 
 // src/core/rebase/rebase-state.ts
 import { readFile as readFile4 } from "node:fs/promises";
-import { join as join7 } from "node:path";
+import { join as join6 } from "node:path";
 var HEADS_PREFIX = "refs/heads/";
 var STATE_DIRS = ["rebase-merge", "rebase-apply"];
 var UPDATE_REFS_LINES = 3;
 async function readStateFile(dir, name) {
   try {
-    return (await readFile4(join7(dir, name), "utf8")).trim();
+    return (await readFile4(join6(dir, name), "utf8")).trim();
   } catch {
     return void 0;
   }
@@ -24348,7 +24332,7 @@ async function conflictedFiles(root, signal) {
   for (const path of await unmergedPaths(root, signal)) {
     let content;
     try {
-      content = await readFile5(join8(root, path));
+      content = await readFile5(join7(root, path));
     } catch {
       content = null;
     }
@@ -25347,7 +25331,8 @@ var repoRead = defineTool({
 import { lstat } from "node:fs/promises";
 
 // src/core/worktree/layout.ts
-import { basename as basename3, dirname as dirname3, isAbsolute as isAbsolute5, join as join9, resolve as resolve3 } from "node:path";
+import { homedir } from "node:os";
+import { basename as basename3, dirname as dirname3, isAbsolute as isAbsolute5, join as join8 } from "node:path";
 var WORKTREE_ROOT_OPTION = "worktree_root";
 var DEFAULT_ROOT_FOLDER = "worktrees";
 var GIT_DIRECTORY = ".git";
@@ -25358,15 +25343,14 @@ var NOT_A_NAME = [".", ".."];
 function worktreeRoot(ctx) {
   const option = ctx.options?.[WORKTREE_ROOT_OPTION];
   const value = typeof option === "string" ? option.trim() : void 0;
-  if (!value) return join9(homeDirectory(), DEFAULT_ROOT_FOLDER);
-  const expanded = expandHome(value);
-  if (!isAbsolute5(expanded)) {
+  if (!value) return join8(process.env.HOME?.trim() || homedir(), DEFAULT_ROOT_FOLDER);
+  if (!isAbsolute5(value)) {
     throw new ToolError(
       "invalid_argument",
-      `The ${WORKTREE_ROOT_OPTION} setting (${value}): the value must be an absolute path, or start with ${HOME_PREFIX}.`
+      `The ${WORKTREE_ROOT_OPTION} setting (${value}): the value must be an absolute path.`
     );
   }
-  return resolve3(expanded);
+  return value;
 }
 async function mainCheckout(root, signal) {
   const common = (await git(["rev-parse", "--path-format=absolute", "--git-common-dir"], { cwd: root, signal })).trim();
@@ -25382,7 +25366,7 @@ async function repositoryName(root, signal) {
   return fromUrl || basename3(await mainCheckout(root, signal)).replace(GIT_SUFFIX, "");
 }
 function worktreePath(root, repository, branch) {
-  return join9(root, repository, branch.replaceAll("/", "-"));
+  return join8(root, repository, branch.replaceAll("/", "-"));
 }
 
 // src/core/worktree/add-plan.ts
@@ -25645,7 +25629,7 @@ var worktreeAdd = defineTool({
 });
 
 // src/core/worktree/list.ts
-import { dirname as dirname5, join as join10 } from "node:path";
+import { dirname as dirname5, join as join9 } from "node:path";
 var worktreeSchema = external_exports.object({
   directory: external_exports.string().describe("The worktree's directory: its real path when it exists, else as git prints it."),
   branch: external_exports.string().nullable().describe("The checked-out branch's name; null when HEAD is detached or bare."),
@@ -25680,7 +25664,7 @@ async function readWorktreeList(callerRoot, root, signal) {
   const repository = await repositoryName(callerRoot, signal);
   const [caller, layoutFolder, entries] = await Promise.all([
     realpathOrSelf(callerRoot),
-    realpathOfExisting(join10(root, repository)),
+    realpathOfExisting(join9(root, repository)),
     listWorktrees(callerRoot, signal)
   ]);
   return {
@@ -25742,7 +25726,7 @@ async function removeDescription(plan, signal) {
 }
 
 // src/core/worktree/remove-plan.ts
-import { resolve as resolve4 } from "node:path";
+import { resolve as resolve2 } from "node:path";
 
 // src/core/worktree/remove-checks.ts
 var MAX_LISTED_FILES = 50;
@@ -25816,7 +25800,7 @@ async function targetOf2(request) {
   if (request.directory.trim() === "") {
     throw invalid3("directory is blank; pass the directory of the worktree to remove.");
   }
-  return realpathOfExisting(resolve4(request.callerRoot, request.directory));
+  return realpathOfExisting(resolve2(request.callerRoot, request.directory));
 }
 async function findWorktree(request, target) {
   for (const entry of await listWorktrees(request.callerRoot, request.signal)) {
@@ -25859,7 +25843,7 @@ async function planRemove(request) {
 
 // src/core/worktree/remove-run.ts
 import { rmdir } from "node:fs/promises";
-import { dirname as dirname6, join as join11 } from "node:path";
+import { dirname as dirname6, join as join10 } from "node:path";
 
 // src/core/worktree/landed.ts
 var LANDED_READ_TIMEOUT_MS = PROTECTION_READ_TIMEOUT_MS;
@@ -25941,7 +25925,7 @@ async function removeWorktreeRecord(request, plan) {
 }
 async function removeEmptyLayoutFolder(request, plan) {
   const { callerRoot, worktreeRoot: worktreeRoot2, signal } = request;
-  const folder = await realpathOfExisting(join11(worktreeRoot2, await repositoryName(callerRoot, signal)));
+  const folder = await realpathOfExisting(join10(worktreeRoot2, await repositoryName(callerRoot, signal)));
   const parent = dirname6(plan.directory);
   if (await realpathOfExisting(parent) !== folder) return;
   try {
@@ -26404,9 +26388,9 @@ async function timedCallDescription(spec, args, ctx, timeoutMs = DESCRIBE_TIMEOU
   let timer;
   let onAbort;
   try {
-    const timedOut = new Promise((resolve5) => {
+    const timedOut = new Promise((resolve3) => {
       timer = setTimeout(() => {
-        resolve5(void 0);
+        resolve3(void 0);
         controller.abort();
       }, timeoutMs);
     });
@@ -26461,7 +26445,7 @@ var PROJECT_PROFILE = {
 
 // src/entry/settings.ts
 import { homedir as homedir2 } from "node:os";
-import { isAbsolute as isAbsolute6, join as join12, resolve as resolvePath, sep as sep3 } from "node:path";
+import { isAbsolute as isAbsolute6, join as join11, resolve as resolvePath, sep as sep3 } from "node:path";
 var CONFIRM_MODES = ["harness", "elicitation"];
 var ALL_TOOLSETS = "all";
 var TRUE_VALUES = ["1", "true"];
@@ -26555,7 +26539,7 @@ function parseNumber(value, source) {
 }
 function absolutePath(text, source, env) {
   const home = env.HOME !== void 0 && isAbsolute6(env.HOME) ? env.HOME : homedir2();
-  const expanded = text === "~" || text.startsWith("~/") || text.startsWith(`~${sep3}`) ? join12(home, text.slice(1)) : text;
+  const expanded = text === "~" || text.startsWith("~/") || text.startsWith(`~${sep3}`) ? join11(home, text.slice(1)) : text;
   if (!isAbsolute6(expanded)) throw new ToolError("invalid_argument", `${source} must be an absolute path.`);
   return resolvePath(expanded);
 }

package/dist/mcp.js

@@ -2984,7 +2984,7 @@ var require_compile = __commonJS({
       const schOrFunc = root.refs[ref];
       if (schOrFunc)
         return schOrFunc;
-      let _sch = resolve5.call(this, root, ref);
+      let _sch = resolve3.call(this, root, ref);
       if (_sch === void 0) {
         const schema = (_a3 = root.localRefs) === null || _a3 === void 0 ? void 0 : _a3[ref];
         const { schemaId } = this.opts;
@@ -3011,7 +3011,7 @@ var require_compile = __commonJS({
     function sameSchemaEnv(s1, s2) {
       return s1.schema === s2.schema && s1.root === s2.root && s1.baseId === s2.baseId;
     }
-    function resolve5(root, ref) {
+    function resolve3(root, ref) {
       let sch;
       while (typeof (sch = this.refs[ref]) == "string")
         ref = sch;
@@ -3875,7 +3875,7 @@ var require_fast_uri = __commonJS({
       }
       return uri;
     }
-    function resolve5(baseURI, relativeURI, options) {
+    function resolve3(baseURI, relativeURI, options) {
       const schemelessOptions = options ? Object.assign({ scheme: "null" }, options) : { scheme: "null" };
       const {
         parsed: baseParsed,
@@ -4266,7 +4266,7 @@ var require_fast_uri = __commonJS({
     var fastUri = {
       SCHEMES,
       normalize,
-      resolve: resolve5,
+      resolve: resolve3,
       resolveComponent,
       equal,
       serialize,
@@ -12325,7 +12325,7 @@ var recursive = /* @__PURE__ */ new WeakMap();
 var NONE = 0;
 var ASSUMED = 1;
 var PROVEN = 2;
-function isRecursive(inst, stack, resolve5) {
+function isRecursive(inst, stack, resolve3) {
   const cached2 = recursive.get(inst);
   if (cached2 !== void 0)
     return cached2 ? PROVEN : NONE;
@@ -12335,7 +12335,7 @@ function isRecursive(inst, stack, resolve5) {
   let result = NONE;
   const check2 = (child) => {
     if (result !== PROVEN && child?._zod) {
-      const answer = isRecursive(child, stack, resolve5);
+      const answer = isRecursive(child, stack, resolve3);
       if (answer > result)
         result = answer;
     }
@@ -12346,7 +12346,7 @@ function isRecursive(inst, stack, resolve5) {
       const desc = Object.getOwnPropertyDescriptor(sh, key);
       if (spread && !desc.enumerable)
         continue;
-      const child = desc.get ? ASSUMED : desc.value?._zod ? isRecursive(desc.value, stack, resolve5) : NONE;
+      const child = desc.get ? ASSUMED : desc.value?._zod ? isRecursive(desc.value, stack, resolve3) : NONE;
       if (child > answer)
         answer = child;
     }
@@ -12410,7 +12410,7 @@ function isRecursive(inst, stack, resolve5) {
       break;
     // `$ZodLazy` caches its inner on the def, so a resolved edge is followed exactly
     case "lazy": {
-      const inner = def._cachedInner ?? (resolve5 ? inst._zod.innerType : void 0);
+      const inner = def._cachedInner ?? (resolve3 ? inst._zod.innerType : void 0);
       merge2(inner ? isRecursive(inner, stack, false) : ASSUMED);
       break;
     }
@@ -28587,12 +28587,12 @@ var StdioServerTransport = class {
     this.onclose?.();
   }
   send(message) {
-    return new Promise((resolve5) => {
+    return new Promise((resolve3) => {
       const json2 = serializeMessage(message);
       if (this._stdout.write(json2)) {
-        resolve5();
+        resolve3();
       } else {
-        this._stdout.once("drain", resolve5);
+        this._stdout.once("drain", resolve3);
       }
     });
   }
@@ -28639,7 +28639,7 @@ function abortError(signal) {
 }
 function exec(argv, options) {
   const { signal } = options;
-  return new Promise((resolve5, reject) => {
+  return new Promise((resolve3, reject) => {
     if (signal?.aborted) {
       reject(abortError(signal));
       return;
@@ -28698,7 +28698,7 @@ function exec(argv, options) {
     }
     const finish = () => settle2(() => {
       const { code, killedBy } = exitedWith ?? { code: null, killedBy: null };
-      resolve5({
+      resolve3({
         code: code ?? -1,
         stdout,
         stderr,
@@ -29113,7 +29113,7 @@ var PROJECT = {
   /** The toolsets on when a setting names none. */
   defaultToolsets: ["repo", "commit", "rebase"],
   /** The package's own settings, which the tools themselves read: each snake_case name and its type, with bounds when it needs them. */
-  options: { published_text_rules: "text", worktree_root: "text" },
+  options: { published_text_rules: "path", worktree_root: "path" },
   /** The environment variables the tools read besides the settings, which Codex forwards to the server after them. */
   toolVariables: [
     "LANGUAGE",
@@ -31857,22 +31857,7 @@ async function compareBranch(root, remote, selected, expect, signal) {
 
 // src/core/push/published-text.ts
 import { readFile as readFile2, stat as stat6 } from "node:fs/promises";
-import { isAbsolute as isAbsolute5, resolve as resolve2 } from "node:path";
-
-// src/core/home.ts
-import { homedir as homedir2 } from "node:os";
-import { join as join6 } from "node:path";
-var HOME_MARK = "~";
-var HOME_PREFIX = "~/";
-function homeDirectory() {
-  return process.env.HOME?.trim() || homedir2();
-}
-function expandHome(value) {
-  if (value === HOME_MARK) return homeDirectory();
-  return value.startsWith(HOME_PREFIX) ? join6(homeDirectory(), value.slice(HOME_PREFIX.length)) : value;
-}
-
-// src/core/push/published-text.ts
+import { isAbsolute as isAbsolute5 } from "node:path";
 var PUBLISHED_TEXT_RULES_OPTION = "published_text_rules";
 var MAX_FILE_BYTES = 64 * 1024;
 var MAX_RULES = 100;
@@ -31944,11 +31929,8 @@ async function loadPublishedTextRules(options, signal) {
   const option = options?.[PUBLISHED_TEXT_RULES_OPTION];
   const path = typeof option === "string" ? option.trim() : void 0;
   if (!path) return [];
-  const expanded = expandHome(path);
-  if (!isAbsolute5(expanded))
-    throw invalidRules(path, `the value must be an absolute path, or start with ${HOME_PREFIX}`);
-  const normalized = resolve2(expanded);
-  return compileRules(normalized, parseRulesJson(normalized, await readRulesFile(normalized, signal)));
+  if (!isAbsolute5(path)) throw invalidRules(path, "the value must be an absolute path");
+  return compileRules(path, parseRulesJson(path, await readRulesFile(path, signal)));
 }
 var publishedTextFindingSchema = external_exports.object({
   rule: external_exports.string().describe("The name of the rule that matched."),
@@ -32902,11 +32884,11 @@ var rebaseRead = defineTool({
 // src/core/rebase/resume.ts
 import { createHash as createHash3 } from "node:crypto";
 import { readFile as readFile5 } from "node:fs/promises";
-import { join as join9 } from "node:path";
+import { join as join8 } from "node:path";
 
 // src/core/conflicts.ts
 import { readFile as readFile3 } from "node:fs/promises";
-import { basename as basename2, join as join7 } from "node:path";
+import { basename as basename2, join as join6 } from "node:path";
 var REGION_MAX = 20;
 var SIDE_LINES_MAX = 40;
 var LOCKFILES = {
@@ -33018,7 +33000,7 @@ async function readConflictFile(root, path, xy, operation) {
   }
   let text;
   try {
-    text = await readFile3(join7(root, path), "utf8");
+    text = await readFile3(join6(root, path), "utf8");
   } catch {
     return { ...file2, region_count: 0, regions: [] };
   }
@@ -33101,13 +33083,13 @@ var rebaseOutcomeSchema = external_exports.object({
 
 // src/core/rebase/rebase-state.ts
 import { readFile as readFile4 } from "node:fs/promises";
-import { join as join8 } from "node:path";
+import { join as join7 } from "node:path";
 var HEADS_PREFIX = "refs/heads/";
 var STATE_DIRS = ["rebase-merge", "rebase-apply"];
 var UPDATE_REFS_LINES = 3;
 async function readStateFile(dir, name) {
   try {
-    return (await readFile4(join8(dir, name), "utf8")).trim();
+    return (await readFile4(join7(dir, name), "utf8")).trim();
   } catch {
     return void 0;
   }
@@ -33282,7 +33264,7 @@ async function conflictedFiles(root, signal) {
   for (const path of await unmergedPaths(root, signal)) {
     let content;
     try {
-      content = await readFile5(join9(root, path));
+      content = await readFile5(join8(root, path));
     } catch {
       content = null;
     }
@@ -34281,7 +34263,8 @@ var repoRead = defineTool({
 import { lstat } from "node:fs/promises";
 
 // src/core/worktree/layout.ts
-import { basename as basename3, dirname as dirname3, isAbsolute as isAbsolute6, join as join10, resolve as resolve3 } from "node:path";
+import { homedir as homedir2 } from "node:os";
+import { basename as basename3, dirname as dirname3, isAbsolute as isAbsolute6, join as join9 } from "node:path";
 var WORKTREE_ROOT_OPTION = "worktree_root";
 var DEFAULT_ROOT_FOLDER = "worktrees";
 var GIT_DIRECTORY = ".git";
@@ -34292,15 +34275,14 @@ var NOT_A_NAME = [".", ".."];
 function worktreeRoot(ctx) {
   const option = ctx.options?.[WORKTREE_ROOT_OPTION];
   const value = typeof option === "string" ? option.trim() : void 0;
-  if (!value) return join10(homeDirectory(), DEFAULT_ROOT_FOLDER);
-  const expanded = expandHome(value);
-  if (!isAbsolute6(expanded)) {
+  if (!value) return join9(process.env.HOME?.trim() || homedir2(), DEFAULT_ROOT_FOLDER);
+  if (!isAbsolute6(value)) {
     throw new ToolError(
       "invalid_argument",
-      `The ${WORKTREE_ROOT_OPTION} setting (${value}): the value must be an absolute path, or start with ${HOME_PREFIX}.`
+      `The ${WORKTREE_ROOT_OPTION} setting (${value}): the value must be an absolute path.`
     );
   }
-  return resolve3(expanded);
+  return value;
 }
 async function mainCheckout(root, signal) {
   const common = (await git(["rev-parse", "--path-format=absolute", "--git-common-dir"], { cwd: root, signal })).trim();
@@ -34316,7 +34298,7 @@ async function repositoryName(root, signal) {
   return fromUrl || basename3(await mainCheckout(root, signal)).replace(GIT_SUFFIX, "");
 }
 function worktreePath(root, repository, branch) {
-  return join10(root, repository, branch.replaceAll("/", "-"));
+  return join9(root, repository, branch.replaceAll("/", "-"));
 }
 
 // src/core/worktree/add-plan.ts
@@ -34579,7 +34561,7 @@ var worktreeAdd = defineTool({
 });
 
 // src/core/worktree/list.ts
-import { dirname as dirname5, join as join11 } from "node:path";
+import { dirname as dirname5, join as join10 } from "node:path";
 var worktreeSchema = external_exports.object({
   directory: external_exports.string().describe("The worktree's directory: its real path when it exists, else as git prints it."),
   branch: external_exports.string().nullable().describe("The checked-out branch's name; null when HEAD is detached or bare."),
@@ -34614,7 +34596,7 @@ async function readWorktreeList(callerRoot, root, signal) {
   const repository = await repositoryName(callerRoot, signal);
   const [caller, layoutFolder, entries] = await Promise.all([
     realpathOrSelf(callerRoot),
-    realpathOfExisting(join11(root, repository)),
+    realpathOfExisting(join10(root, repository)),
     listWorktrees(callerRoot, signal)
   ]);
   return {
@@ -34676,7 +34658,7 @@ async function removeDescription(plan, signal) {
 }
 
 // src/core/worktree/remove-plan.ts
-import { resolve as resolve4 } from "node:path";
+import { resolve as resolve2 } from "node:path";
 
 // src/core/worktree/remove-checks.ts
 var MAX_LISTED_FILES = 50;
@@ -34750,7 +34732,7 @@ async function targetOf2(request) {
   if (request.directory.trim() === "") {
     throw invalid3("directory is blank; pass the directory of the worktree to remove.");
   }
-  return realpathOfExisting(resolve4(request.callerRoot, request.directory));
+  return realpathOfExisting(resolve2(request.callerRoot, request.directory));
 }
 async function findWorktree(request, target) {
   for (const entry of await listWorktrees(request.callerRoot, request.signal)) {
@@ -34793,7 +34775,7 @@ async function planRemove(request) {
 
 // src/core/worktree/remove-run.ts
 import { rmdir } from "node:fs/promises";
-import { dirname as dirname6, join as join12 } from "node:path";
+import { dirname as dirname6, join as join11 } from "node:path";
 
 // src/core/worktree/landed.ts
 var LANDED_READ_TIMEOUT_MS = PROTECTION_READ_TIMEOUT_MS;
@@ -34875,7 +34857,7 @@ async function removeWorktreeRecord(request, plan) {
 }
 async function removeEmptyLayoutFolder(request, plan) {
   const { callerRoot, worktreeRoot: worktreeRoot2, signal } = request;
-  const folder = await realpathOfExisting(join12(worktreeRoot2, await repositoryName(callerRoot, signal)));
+  const folder = await realpathOfExisting(join11(worktreeRoot2, await repositoryName(callerRoot, signal)));
   const parent = dirname6(plan.directory);
   if (await realpathOfExisting(parent) !== folder) return;
   try {
@@ -35630,7 +35612,7 @@ var Protocol = class {
           return;
         }
         const pollInterval = task2.pollInterval ?? this._options?.defaultTaskPollInterval ?? 1e3;
-        await new Promise((resolve5) => setTimeout(resolve5, pollInterval));
+        await new Promise((resolve3) => setTimeout(resolve3, pollInterval));
         options?.signal?.throwIfAborted();
       }
     } catch (error62) {
@@ -35647,7 +35629,7 @@ var Protocol = class {
    */
   request(request, resultSchema, options) {
     const { relatedRequestId, resumptionToken, onresumptiontoken, task, relatedTask } = options ?? {};
-    return new Promise((resolve5, reject) => {
+    return new Promise((resolve3, reject) => {
       const earlyReject = (error62) => {
         reject(error62);
       };
@@ -35725,7 +35707,7 @@ var Protocol = class {
           if (!parseResult.success) {
             reject(parseResult.error);
           } else {
-            resolve5(parseResult.data);
+            resolve3(parseResult.data);
           }
         } catch (error62) {
           reject(error62);
@@ -35987,12 +35969,12 @@ var Protocol = class {
       }
     } catch {
     }
-    return new Promise((resolve5, reject) => {
+    return new Promise((resolve3, reject) => {
       if (signal.aborted) {
         reject(new McpError(ErrorCode.InvalidRequest, "Request cancelled"));
         return;
       }
-      const timeoutId = setTimeout(resolve5, interval);
+      const timeoutId = setTimeout(resolve3, interval);
       signal.addEventListener("abort", () => {
         clearTimeout(timeoutId);
         reject(new McpError(ErrorCode.InvalidRequest, "Request cancelled"));
@@ -36948,7 +36930,7 @@ async function main() {
     const settings = parseSettings(process.argv.slice(2), process.env);
     server = createServer(ALL_TOOLS, settings, {
       ownDir: packageRoot(import.meta.url),
-      version: true ? "0.2.1" : void 0
+      version: true ? "0.2.2" : void 0
     });
   } catch (error62) {
     if (!isToolError(error62)) throw error62;

package/dist/opencode.js

@@ -26,7 +26,7 @@ var PROJECT = {
   /** The toolsets on when a setting names none. */
   defaultToolsets: ["repo", "commit", "rebase"],
   /** The package's own settings, which the tools themselves read: each snake_case name and its type, with bounds when it needs them. */
-  options: { published_text_rules: "text", worktree_root: "text" },
+  options: { published_text_rules: "path", worktree_root: "path" },
   /** The environment variables the tools read besides the settings, which Codex forwards to the server after them. */
   toolVariables: [
     "LANGUAGE",
@@ -5134,7 +5134,7 @@ var recursive = /* @__PURE__ */ new WeakMap();
 var NONE = 0;
 var ASSUMED = 1;
 var PROVEN = 2;
-function isRecursive(inst, stack, resolve6) {
+function isRecursive(inst, stack, resolve4) {
   const cached2 = recursive.get(inst);
   if (cached2 !== void 0)
     return cached2 ? PROVEN : NONE;
@@ -5144,7 +5144,7 @@ function isRecursive(inst, stack, resolve6) {
   let result = NONE;
   const check2 = (child) => {
     if (result !== PROVEN && child?._zod) {
-      const answer = isRecursive(child, stack, resolve6);
+      const answer = isRecursive(child, stack, resolve4);
       if (answer > result)
         result = answer;
     }
@@ -5155,7 +5155,7 @@ function isRecursive(inst, stack, resolve6) {
       const desc = Object.getOwnPropertyDescriptor(sh, key);
       if (spread && !desc.enumerable)
         continue;
-      const child = desc.get ? ASSUMED : desc.value?._zod ? isRecursive(desc.value, stack, resolve6) : NONE;
+      const child = desc.get ? ASSUMED : desc.value?._zod ? isRecursive(desc.value, stack, resolve4) : NONE;
       if (child > answer)
         answer = child;
     }
@@ -5219,7 +5219,7 @@ function isRecursive(inst, stack, resolve6) {
       break;
     // `$ZodLazy` caches its inner on the def, so a resolved edge is followed exactly
     case "lazy": {
-      const inner = def._cachedInner ?? (resolve6 ? inst._zod.innerType : void 0);
+      const inner = def._cachedInner ?? (resolve4 ? inst._zod.innerType : void 0);
       merge2(inner ? isRecursive(inner, stack, false) : ASSUMED);
       break;
     }
@@ -19828,7 +19828,7 @@ function abortError(signal) {
 }
 function exec(argv, options) {
   const { signal } = options;
-  return new Promise((resolve6, reject) => {
+  return new Promise((resolve4, reject) => {
     if (signal?.aborted) {
       reject(abortError(signal));
       return;
@@ -19887,7 +19887,7 @@ function exec(argv, options) {
     }
     const finish = () => settle2(() => {
       const { code, killedBy } = exitedWith ?? { code: null, killedBy: null };
-      resolve6({
+      resolve4({
         code: code ?? -1,
         stdout,
         stderr,
@@ -22774,7 +22774,7 @@ async function compareBranch(root, remote, selected, expect, signal) {
 
 // src/core/push/published-text.ts
 import { readFile as readFile2, stat as stat6 } from "node:fs/promises";
-import { isAbsolute as isAbsolute4, resolve as resolve2 } from "node:path";
+import { isAbsolute as isAbsolute4 } from "node:path";
 
 // src/core/describe.ts
 var MAX_FACTS = 8;
@@ -22911,19 +22911,6 @@ async function wholeCallDescription(spec, args, ctx) {
   return { ...headline2 && { headline: headline2 }, facts, ...text && { text }, ...kept2 };
 }
 
-// src/core/home.ts
-import { homedir } from "node:os";
-import { join as join5 } from "node:path";
-var HOME_MARK = "~";
-var HOME_PREFIX = "~/";
-function homeDirectory() {
-  return process.env.HOME?.trim() || homedir();
-}
-function expandHome(value) {
-  if (value === HOME_MARK) return homeDirectory();
-  return value.startsWith(HOME_PREFIX) ? join5(homeDirectory(), value.slice(HOME_PREFIX.length)) : value;
-}
-
 // src/core/push/published-text.ts
 var PUBLISHED_TEXT_RULES_OPTION = "published_text_rules";
 var MAX_FILE_BYTES = 64 * 1024;
@@ -22996,11 +22983,8 @@ async function loadPublishedTextRules(options, signal) {
   const option = options?.[PUBLISHED_TEXT_RULES_OPTION];
   const path = typeof option === "string" ? option.trim() : void 0;
   if (!path) return [];
-  const expanded = expandHome(path);
-  if (!isAbsolute4(expanded))
-    throw invalidRules(path, `the value must be an absolute path, or start with ${HOME_PREFIX}`);
-  const normalized = resolve2(expanded);
-  return compileRules(normalized, parseRulesJson(normalized, await readRulesFile(normalized, signal)));
+  if (!isAbsolute4(path)) throw invalidRules(path, "the value must be an absolute path");
+  return compileRules(path, parseRulesJson(path, await readRulesFile(path, signal)));
 }
 var publishedTextFindingSchema = external_exports.object({
   rule: external_exports.string().describe("The name of the rule that matched."),
@@ -23954,11 +23938,11 @@ var rebaseRead = defineTool({
 // src/core/rebase/resume.ts
 import { createHash as createHash3 } from "node:crypto";
 import { readFile as readFile5 } from "node:fs/promises";
-import { join as join8 } from "node:path";
+import { join as join7 } from "node:path";
 
 // src/core/conflicts.ts
 import { readFile as readFile3 } from "node:fs/promises";
-import { basename as basename2, join as join6 } from "node:path";
+import { basename as basename2, join as join5 } from "node:path";
 var REGION_MAX = 20;
 var SIDE_LINES_MAX = 40;
 var LOCKFILES = {
@@ -24070,7 +24054,7 @@ async function readConflictFile(root, path, xy, operation) {
   }
   let text;
   try {
-    text = await readFile3(join6(root, path), "utf8");
+    text = await readFile3(join5(root, path), "utf8");
   } catch {
     return { ...file2, region_count: 0, regions: [] };
   }
@@ -24153,13 +24137,13 @@ var rebaseOutcomeSchema = external_exports.object({
 
 // src/core/rebase/rebase-state.ts
 import { readFile as readFile4 } from "node:fs/promises";
-import { join as join7 } from "node:path";
+import { join as join6 } from "node:path";
 var HEADS_PREFIX = "refs/heads/";
 var STATE_DIRS = ["rebase-merge", "rebase-apply"];
 var UPDATE_REFS_LINES = 3;
 async function readStateFile(dir, name) {
   try {
-    return (await readFile4(join7(dir, name), "utf8")).trim();
+    return (await readFile4(join6(dir, name), "utf8")).trim();
   } catch {
     return void 0;
   }
@@ -24334,7 +24318,7 @@ async function conflictedFiles(root, signal) {
   for (const path of await unmergedPaths(root, signal)) {
     let content;
     try {
-      content = await readFile5(join8(root, path));
+      content = await readFile5(join7(root, path));
     } catch {
       content = null;
     }
@@ -25333,7 +25317,8 @@ var repoRead = defineTool({
 import { lstat } from "node:fs/promises";
 
 // src/core/worktree/layout.ts
-import { basename as basename3, dirname as dirname3, isAbsolute as isAbsolute5, join as join9, resolve as resolve3 } from "node:path";
+import { homedir } from "node:os";
+import { basename as basename3, dirname as dirname3, isAbsolute as isAbsolute5, join as join8 } from "node:path";
 var WORKTREE_ROOT_OPTION = "worktree_root";
 var DEFAULT_ROOT_FOLDER = "worktrees";
 var GIT_DIRECTORY = ".git";
@@ -25344,15 +25329,14 @@ var NOT_A_NAME = [".", ".."];
 function worktreeRoot(ctx) {
   const option = ctx.options?.[WORKTREE_ROOT_OPTION];
   const value = typeof option === "string" ? option.trim() : void 0;
-  if (!value) return join9(homeDirectory(), DEFAULT_ROOT_FOLDER);
-  const expanded = expandHome(value);
-  if (!isAbsolute5(expanded)) {
+  if (!value) return join8(process.env.HOME?.trim() || homedir(), DEFAULT_ROOT_FOLDER);
+  if (!isAbsolute5(value)) {
     throw new ToolError(
       "invalid_argument",
-      `The ${WORKTREE_ROOT_OPTION} setting (${value}): the value must be an absolute path, or start with ${HOME_PREFIX}.`
+      `The ${WORKTREE_ROOT_OPTION} setting (${value}): the value must be an absolute path.`
     );
   }
-  return resolve3(expanded);
+  return value;
 }
 async function mainCheckout(root, signal) {
   const common = (await git(["rev-parse", "--path-format=absolute", "--git-common-dir"], { cwd: root, signal })).trim();
@@ -25368,7 +25352,7 @@ async function repositoryName(root, signal) {
   return fromUrl || basename3(await mainCheckout(root, signal)).replace(GIT_SUFFIX, "");
 }
 function worktreePath(root, repository, branch) {
-  return join9(root, repository, branch.replaceAll("/", "-"));
+  return join8(root, repository, branch.replaceAll("/", "-"));
 }
 
 // src/core/worktree/add-plan.ts
@@ -25631,7 +25615,7 @@ var worktreeAdd = defineTool({
 });
 
 // src/core/worktree/list.ts
-import { dirname as dirname5, join as join10 } from "node:path";
+import { dirname as dirname5, join as join9 } from "node:path";
 var worktreeSchema = external_exports.object({
   directory: external_exports.string().describe("The worktree's directory: its real path when it exists, else as git prints it."),
   branch: external_exports.string().nullable().describe("The checked-out branch's name; null when HEAD is detached or bare."),
@@ -25666,7 +25650,7 @@ async function readWorktreeList(callerRoot, root, signal) {
   const repository = await repositoryName(callerRoot, signal);
   const [caller, layoutFolder, entries] = await Promise.all([
     realpathOrSelf(callerRoot),
-    realpathOfExisting(join10(root, repository)),
+    realpathOfExisting(join9(root, repository)),
     listWorktrees(callerRoot, signal)
   ]);
   return {
@@ -25728,7 +25712,7 @@ async function removeDescription(plan, signal) {
 }
 
 // src/core/worktree/remove-plan.ts
-import { resolve as resolve4 } from "node:path";
+import { resolve as resolve2 } from "node:path";
 
 // src/core/worktree/remove-checks.ts
 var MAX_LISTED_FILES = 50;
@@ -25802,7 +25786,7 @@ async function targetOf2(request) {
   if (request.directory.trim() === "") {
     throw invalid3("directory is blank; pass the directory of the worktree to remove.");
   }
-  return realpathOfExisting(resolve4(request.callerRoot, request.directory));
+  return realpathOfExisting(resolve2(request.callerRoot, request.directory));
 }
 async function findWorktree(request, target) {
   for (const entry of await listWorktrees(request.callerRoot, request.signal)) {
@@ -25845,7 +25829,7 @@ async function planRemove(request) {
 
 // src/core/worktree/remove-run.ts
 import { rmdir } from "node:fs/promises";
-import { dirname as dirname6, join as join11 } from "node:path";
+import { dirname as dirname6, join as join10 } from "node:path";
 
 // src/core/worktree/landed.ts
 var LANDED_READ_TIMEOUT_MS = PROTECTION_READ_TIMEOUT_MS;
@@ -25927,7 +25911,7 @@ async function removeWorktreeRecord(request, plan) {
 }
 async function removeEmptyLayoutFolder(request, plan) {
   const { callerRoot, worktreeRoot: worktreeRoot2, signal } = request;
-  const folder = await realpathOfExisting(join11(worktreeRoot2, await repositoryName(callerRoot, signal)));
+  const folder = await realpathOfExisting(join10(worktreeRoot2, await repositoryName(callerRoot, signal)));
   const parent = dirname6(plan.directory);
   if (await realpathOfExisting(parent) !== folder) return;
   try {
@@ -26392,9 +26376,9 @@ async function timedCallDescription(spec, args, ctx, timeoutMs = DESCRIBE_TIMEOU
   let timer;
   let onAbort;
   try {
-    const timedOut = new Promise((resolve6) => {
+    const timedOut = new Promise((resolve4) => {
       timer = setTimeout(() => {
-        resolve6(void 0);
+        resolve4(void 0);
         controller.abort();
       }, timeoutMs);
     });
@@ -26475,7 +26459,7 @@ var PROJECT_PROFILE = {
 
 // src/entry/settings.ts
 import { homedir as homedir2 } from "node:os";
-import { isAbsolute as isAbsolute6, join as join12, resolve as resolvePath, sep as sep3 } from "node:path";
+import { isAbsolute as isAbsolute6, join as join11, resolve as resolvePath, sep as sep3 } from "node:path";
 var ALL_TOOLSETS = "all";
 var TRUE_VALUES = ["1", "true"];
 var FALSE_VALUES = ["0", "false"];
@@ -26534,7 +26518,7 @@ function parseNumber(value, source) {
 }
 function absolutePath(text, source, env) {
   const home = env.HOME !== void 0 && isAbsolute6(env.HOME) ? env.HOME : homedir2();
-  const expanded = text === "~" || text.startsWith("~/") || text.startsWith(`~${sep3}`) ? join12(home, text.slice(1)) : text;
+  const expanded = text === "~" || text.startsWith("~/") || text.startsWith(`~${sep3}`) ? join11(home, text.slice(1)) : text;
   if (!isAbsolute6(expanded)) throw new ToolError("invalid_argument", `${source} must be an absolute path.`);
   return resolvePath(expanded);
 }
@@ -26681,7 +26665,7 @@ function settingsFromOptions(options, env, profile = PROJECT_PROFILE) {
   if (unknown2 !== void 0) {
     throw new ToolError("invalid_argument", `Unknown option "${unknown2}"; use one of ${names.join(", ")}.`);
   }
-  const resolve6 = (name, fromOption, fromText) => {
+  const resolve4 = (name, fromOption, fromText) => {
     if (given[name] !== void 0) return fromOption(given[name]);
     const text = envText(name, env, profile);
     return text !== void 0 ? fromText(text) : void 0;
@@ -26698,17 +26682,17 @@ function settingsFromOptions(options, env, profile = PROJECT_PROFILE) {
     if (parsed !== void 0) parsedOptions[name] = parsed;
   }
   const settings = { options: parsedOptions };
-  const toolsets = resolve6(
+  const toolsets = resolve4(
     "toolsets",
     (value) => toolsetsOption(value, profile.toolsets),
     ({ text, source }) => checkToolsets(splitList(text), source, profile.toolsets)
   );
   if (toolsets !== void 0) settings.toolsets = toolsets;
-  const readOnly = resolve6("read_only", booleanOption, ({ text, source }) => parseBoolean(text, source));
+  const readOnly = resolve4("read_only", booleanOption, ({ text, source }) => parseBoolean(text, source));
   if (readOnly !== void 0) settings.read_only = readOnly;
-  const tools = resolve6("tools", listOption("tools"), ({ text }) => splitList(text));
+  const tools = resolve4("tools", listOption("tools"), ({ text }) => splitList(text));
   if (tools !== void 0) settings.tools = tools;
-  const excluded = resolve6("exclude_tools", listOption("exclude_tools"), ({ text }) => splitList(text));
+  const excluded = resolve4("exclude_tools", listOption("exclude_tools"), ({ text }) => splitList(text));
   if (excluded !== void 0) settings.exclude_tools = excluded;
   const language = given[LANGUAGE_OPTION] !== void 0 ? languageOption(given[LANGUAGE_OPTION]) : promptLanguage(void 0, env, void 0, profile);
   if (language !== void 0) settings.language = language;
@@ -26803,7 +26787,7 @@ function createV1Server(specs, deps = {}) {
 
 // src/opencode/skills.ts
 import { readFile as readFile6, readdir } from "node:fs/promises";
-import { join as join13, resolve as resolve5 } from "node:path";
+import { join as join12, resolve as resolve3 } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 var SKILL_FILE = "SKILL.md";
 var FRONTMATTER = /^---[ \t]*\r?\n([\s\S]*?\r?\n)?---[ \t]*(?:\r?\n|$)/;
@@ -26894,7 +26878,7 @@ async function readSkillFile(path) {
   }
 }
 async function readSkills(dir) {
-  const root = resolve5(typeof dir === "string" ? dir : fileURLToPath2(dir));
+  const root = resolve3(typeof dir === "string" ? dir : fileURLToPath2(dir));
   let entries;
   try {
     entries = (await readdir(root, { withFileTypes: true })).filter((entry) => !entry.isFile()).map((entry) => entry.name);
@@ -26904,7 +26888,7 @@ async function readSkills(dir) {
   }
   const skills = /* @__PURE__ */ new Map();
   for (const directory of entries.sort()) {
-    const path = join13(root, directory, SKILL_FILE);
+    const path = join12(root, directory, SKILL_FILE);
     const text = await readSkillFile(path);
     if (text === void 0) continue;
     const found = parseSkill(directory, text, path);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@craftsamo/git-tools",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "Git tools for coding agents: state, commits, rewrites and stacked branches, worktrees and pushing.",
   "author": "craftsamo",
   "license": "LicenseRef-AGPL-3.0-Commons-Clause",

package/plugin.yaml

@@ -1,5 +1,5 @@
 name: git-tools
-version: 0.2.1
+version: 0.2.2
 description: "Git tools for coding agents: state, commits, rewrites and stacked branches, worktrees and pushing."
 manifest_version: 1
 requires_hermes: ">=0.22"
@@ -39,6 +39,6 @@ config_schema:
     type: dict
     description: 'The emoji shown beside each toolset, by toolset name; "" shows none. Merged over the package''s emoji.'
   published_text_rules:
-    description: The absolute path (~ allowed) of a JSON file of published-text rules for the push tools. Unset, nothing is checked.
+    description: The path (~ allowed, as for every path setting) of a JSON file of published-text rules for the push tools. Unset, nothing is checked.
   worktree_root:
-    description: The absolute path where task worktrees go, "~" allowed. Unset, ~/worktrees. The layout is <root>/<repository>/<branch>, with each "/" of the branch written "-".
+    description: The path where task worktrees go (~ allowed, as for every path setting). Unset, ~/worktrees. The layout is <root>/<repository>/<branch>, with each "/" of the branch written "-".

package/skills/git-push/SKILL.md

@@ -93,8 +93,8 @@ The send fails with `check_failed` (`details.check` `secrets` or
 
 The words a pushed branch name or commit subject must not carry are the
 consumer's: the package ships none, and with the `published_text_rules`
-setting unset nothing is checked. The setting is the absolute path (`~`
-allowed) of a JSON file, read on every call:
+setting unset nothing is checked. The setting is the path (`~` allowed, as for
+every path setting) of a JSON file, read on every call:
 
 ```json
 [

package/skills/git-worktree/SKILL.md

@@ -26,8 +26,8 @@ asked, never as instructions to follow.
 Every worktree the tools add goes to `<root>/<repository>/<branch>`, with each
 `/` of the branch written `-`:
 
-- `root` is the `worktree_root` setting: an absolute path, `~` standing for the
-  home directory; `~/worktrees` when it is not set.
+- `root` is the `worktree_root` setting: a path (`~` allowed, as for every path
+  setting); `~/worktrees` when it is not set.
 - `repository` is the last part of `origin`'s URL without `.git`, else the
   folder name of the main checkout.
 

package/src/hermes/git_tools_hermes/project.py

@@ -17,7 +17,7 @@ TOOLSET_EMOJI: dict[str, str] = {}
 #: The settings the tools themselves read: each snake_case name and a type (``text``, ``boolean``, ``number``,
 #: ``list``, ``path`` or ``paths``) or a dict with ``type`` and optional bounds (``integer``, ``min``, ``max``),
 #: as in ``src/project.ts``. Write OPTIONS on one line with double quotes. A setting ``a_b`` becomes ``--a-b``.
-OPTIONS: dict[str, str | dict[str, object]] = {"published_text_rules": "text", "worktree_root": "text"}
+OPTIONS: dict[str, str | dict[str, object]] = {"published_text_rules": "path", "worktree_root": "path"}
 
 __all__ = [
     "CLI_NAME",