terminal-pilot 0.0.15 → 0.0.16

package/dist/cli.js

@@ -2,12 +2,12 @@
 
 // src/cli.ts
 import { realpath } from "node:fs/promises";
-import path11 from "node:path";
-import { fileURLToPath as fileURLToPath4 } from "node:url";
+import path12 from "node:path";
+import { fileURLToPath as fileURLToPath5 } from "node:url";
 
 // ../toolcraft/src/cli.ts
-import { access as access2, readFile as readFile3, writeFile as writeFile3 } from "node:fs/promises";
-import path6 from "node:path";
+import { access as access2, readFile as readFile4, writeFile as writeFile3 } from "node:fs/promises";
+import path7 from "node:path";
 import { Command as CommanderCommand, CommanderError, InvalidArgumentError, Option } from "commander";
 
 // ../design-system/src/tokens/colors.ts
@@ -666,7 +666,7 @@ async function confirm2(opts) {
 import chalk16 from "chalk";
 
 // ../toolcraft/src/index.ts
-import { fileURLToPath } from "node:url";
+import { fileURLToPath as fileURLToPath2 } from "node:url";
 
 // ../toolcraft/src/user-error.ts
 var UserError = class extends Error {
@@ -835,6 +835,62 @@ var S = {
   Json
 };
 
+// ../toolcraft/src/package-metadata.ts
+import { existsSync, readFileSync, statSync } from "node:fs";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+function pathFromInput(from) {
+  if (from instanceof URL) {
+    return fileURLToPath(from);
+  }
+  if (from.startsWith("file:")) {
+    return fileURLToPath(from);
+  }
+  return path.resolve(from);
+}
+function getSearchDirectory(from) {
+  const resolved = pathFromInput(from);
+  try {
+    return statSync(resolved).isDirectory() ? resolved : path.dirname(resolved);
+  } catch {
+    return path.dirname(resolved);
+  }
+}
+function readPackageMetadata(packageJsonPath) {
+  const parsed = JSON.parse(readFileSync(packageJsonPath, "utf8"));
+  const metadata = { path: packageJsonPath };
+  if (typeof parsed.name === "string") {
+    metadata.name = parsed.name;
+  }
+  if (typeof parsed.version === "string") {
+    metadata.version = parsed.version;
+  }
+  return metadata;
+}
+function findPackageMetadata(from) {
+  let current = getSearchDirectory(from);
+  while (true) {
+    const packageJsonPath = path.join(current, "package.json");
+    if (existsSync(packageJsonPath)) {
+      return readPackageMetadata(packageJsonPath);
+    }
+    const parent = path.dirname(current);
+    if (parent === current) {
+      return void 0;
+    }
+    current = parent;
+  }
+}
+function findEntrypointPackageMetadata(entrypoint) {
+  if (entrypoint === void 0 || entrypoint.length === 0) {
+    return void 0;
+  }
+  if (!path.isAbsolute(entrypoint) && !entrypoint.startsWith("file:")) {
+    return void 0;
+  }
+  return findPackageMetadata(entrypoint);
+}
+
 // ../toolcraft/src/index.ts
 var commandConfigSymbol = /* @__PURE__ */ Symbol("toolcraft.command.config");
 var groupConfigSymbol = /* @__PURE__ */ Symbol("toolcraft.group.config");
@@ -920,7 +976,7 @@ function validateRenameMap(rename2) {
 function parseStackPath(candidate) {
   if (candidate.startsWith("file://")) {
     try {
-      return fileURLToPath(candidate);
+      return fileURLToPath2(candidate);
     } catch {
       return void 0;
     }
@@ -1275,7 +1331,7 @@ function getCommandSourcePath(command) {
 import * as fsPromises2 from "node:fs/promises";
 
 // ../task-list/src/backends/markdown-dir.ts
-import path2 from "node:path";
+import path3 from "node:path";
 
 // ../file-lock/src/lock.ts
 import * as fsPromises from "node:fs/promises";
@@ -1323,21 +1379,82 @@ function backoff(attempt, minTimeout, maxTimeout) {
 function hasErrorCode(error2, code) {
   return !!error2 && typeof error2 === "object" && "code" in error2 && error2.code === code;
 }
+function hasAnyErrorCode(error2, codes) {
+  return codes.some((code) => hasErrorCode(error2, code));
+}
+function isPidRunning(pid) {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch (error2) {
+    return !hasErrorCode(error2, "ESRCH");
+  }
+}
 function createDefaultFs() {
   return {
-    open: (path12, flags) => fsPromises.open(path12, flags),
+    open: (path13, flags) => fsPromises.open(path13, flags),
+    readFile: (path13, encoding) => fsPromises.readFile(path13, encoding),
     stat: fsPromises.stat,
     unlink: fsPromises.unlink
   };
 }
-async function removeLockFile(fs2, lockPath) {
+async function removeLockFile(fs2, lockPath, signal) {
+  for (let attempt = 0; attempt <= 4; attempt += 1) {
+    throwIfAborted(signal);
+    try {
+      await fs2.unlink(lockPath);
+      return;
+    } catch (error2) {
+      if (hasErrorCode(error2, "ENOENT")) {
+        return;
+      }
+      if (!hasAnyErrorCode(error2, ["EPERM", "EBUSY"]) || attempt === 4) {
+        throw error2;
+      }
+    }
+    await sleep(25 * 2 ** attempt, signal);
+  }
+}
+function parseLockMetadata(content) {
+  try {
+    const parsed = JSON.parse(content);
+    if (!parsed || typeof parsed !== "object" || !("host" in parsed) || !("pid" in parsed)) {
+      return void 0;
+    }
+    const { host, pid } = parsed;
+    if (typeof host === "string" && typeof pid === "number" && Number.isSafeInteger(pid) && pid > 0) {
+      return {
+        host,
+        pid
+      };
+    }
+  } catch (ignoredError) {
+    void ignoredError;
+  }
+  return void 0;
+}
+async function readLockMetadata(fs2, lockPath) {
+  if (!fs2.readFile) {
+    return void 0;
+  }
   try {
-    await fs2.unlink(lockPath);
+    return parseLockMetadata(await fs2.readFile(lockPath, "utf8"));
   } catch (error2) {
-    if (!hasErrorCode(error2, "ENOENT")) {
-      throw error2;
+    if (hasErrorCode(error2, "ENOENT")) {
+      return null;
     }
+    return void 0;
+  }
+}
+async function shouldReclaimLock(options) {
+  const metadata = await readLockMetadata(options.fs, options.lockPath);
+  if (metadata === null) {
+    return "missing";
+  }
+  if (metadata?.host === os.hostname()) {
+    return !options.isPidRunning(metadata.pid);
   }
+  return Date.now() - options.stat.mtimeMs > options.staleMs;
 }
 async function writeLockMetadata(handle) {
   try {
@@ -1359,7 +1476,8 @@ async function acquireFileLock(filePath, options = {}) {
   const retries = options.retries ?? 20;
   const minTimeout = options.minTimeout ?? 25;
   const maxTimeout = options.maxTimeout ?? 250;
-  const staleMs = options.staleMs ?? 3e4;
+  const staleMs = options.staleMs ?? 1e3;
+  const pidIsRunning = options.isPidRunning ?? isPidRunning;
   const lockPath = `${filePath}.lock`;
   let attempt = 0;
   while (attempt <= retries) {
@@ -1373,7 +1491,7 @@ async function acquireFileLock(filePath, options = {}) {
           return;
         }
         released = true;
-        await removeLockFile(fs2, lockPath);
+        await removeLockFile(fs2, lockPath, options.signal);
       };
     } catch (error2) {
       if (!hasErrorCode(error2, "EEXIST")) {
@@ -1389,8 +1507,18 @@ async function acquireFileLock(filePath, options = {}) {
       }
       throw statError;
     }
-    if (Date.now() - stat3.mtimeMs > staleMs) {
-      await removeLockFile(fs2, lockPath);
+    const reclaimLock = await shouldReclaimLock({
+      fs: fs2,
+      isPidRunning: pidIsRunning,
+      lockPath,
+      staleMs,
+      stat: stat3
+    });
+    if (reclaimLock === "missing") {
+      continue;
+    }
+    if (reclaimLock) {
+      await removeLockFile(fs2, lockPath, options.signal);
       continue;
     }
     if (attempt >= retries) {
@@ -1582,7 +1710,7 @@ function resolveStateMachine(stateMachine) {
 }
 
 // ../task-list/src/backends/utils.ts
-import path from "node:path";
+import path2 from "node:path";
 var tmpFileCounter = 0;
 function hasErrorCode2(error2, code) {
   return !!error2 && typeof error2 === "object" && "code" in error2 && error2.code === code;
@@ -1615,7 +1743,7 @@ async function statIfExists(fs2, filePath) {
 async function writeAtomically(fs2, filePath, content) {
   const tempPath = `${filePath}.tmp-${process.pid}-${tmpFileCounter}`;
   tmpFileCounter += 1;
-  await fs2.mkdir(path.dirname(filePath), { recursive: true });
+  await fs2.mkdir(path2.dirname(filePath), { recursive: true });
   try {
     await fs2.writeFile(tempPath, content, { encoding: "utf8", flag: "wx" });
     await fs2.rename(tempPath, filePath);
@@ -1662,16 +1790,16 @@ function parseQualifiedId(qualifiedId) {
   };
 }
 function listPath(rootPath, list) {
-  return path2.join(rootPath, list);
+  return path3.join(rootPath, list);
 }
 function archiveDirectoryPath(rootPath, list) {
-  return path2.join(listPath(rootPath, list), ARCHIVE_DIRECTORY_NAME);
+  return path3.join(listPath(rootPath, list), ARCHIVE_DIRECTORY_NAME);
 }
 function activeTaskPath(rootPath, list, id) {
-  return path2.join(listPath(rootPath, list), `${id}${MARKDOWN_EXTENSION}`);
+  return path3.join(listPath(rootPath, list), `${id}${MARKDOWN_EXTENSION}`);
 }
 function archivedTaskPath(rootPath, list, id) {
-  return path2.join(archiveDirectoryPath(rootPath, list), `${id}${MARKDOWN_EXTENSION}`);
+  return path3.join(archiveDirectoryPath(rootPath, list), `${id}${MARKDOWN_EXTENSION}`);
 }
 function isMarkdownFile(entryName) {
   return entryName.endsWith(MARKDOWN_EXTENSION);
@@ -1903,7 +2031,7 @@ function createTasksView(deps, list) {
       if (isHiddenEntry(entryName) || isLockFile(entryName) || !isMarkdownFile(entryName)) {
         continue;
       }
-      const entryPath = path2.join(directoryPath, entryName);
+      const entryPath = path3.join(directoryPath, entryName);
       const entryStat = await statIfExists(deps.fs, entryPath);
       if (!entryStat?.isFile()) {
         continue;
@@ -2058,7 +2186,7 @@ async function markdownDirBackend(deps) {
       if (entryName === ARCHIVE_DIRECTORY_NAME || isHiddenEntry(entryName) || isLockFile(entryName)) {
         continue;
       }
-      const entryPath = path2.join(deps.path, entryName);
+      const entryPath = path3.join(deps.path, entryName);
       const entryStat = await statIfExists(deps.fs, entryPath);
       if (entryStat?.isDirectory()) {
         result.push(entryName);
@@ -2758,7 +2886,7 @@ function areEqualStrings(left, right) {
 }
 
 // ../toolcraft/src/human-in-loop/runner.ts
-import { access, readFile, writeFile } from "node:fs/promises";
+import { access, readFile as readFile2, writeFile } from "node:fs/promises";
 
 // ../toolcraft/src/human-in-loop/default-provider.ts
 import process2 from "node:process";
@@ -3057,13 +3185,13 @@ function createHandlerContext(command, params17) {
 }
 function createFs() {
   return {
-    readFile: async (path12, encoding = "utf8") => readFile(path12, { encoding }),
-    writeFile: async (path12, contents) => {
-      await writeFile(path12, contents);
+    readFile: async (path13, encoding = "utf8") => readFile2(path13, { encoding }),
+    writeFile: async (path13, contents) => {
+      await writeFile(path13, contents);
     },
-    exists: async (path12) => {
+    exists: async (path13) => {
       try {
-        await access(path12);
+        await access(path13);
         return true;
       } catch {
         return false;
@@ -3315,23 +3443,23 @@ function escapeMarkdownCell(value) {
 }
 
 // ../toolcraft/src/mcp-proxy.ts
-import { existsSync } from "node:fs";
-import { mkdir, readFile as readFile2, rename, unlink as unlink2, writeFile as writeFile2 } from "node:fs/promises";
-import path5 from "node:path";
+import { existsSync as existsSync2 } from "node:fs";
+import { mkdir, readFile as readFile3, rename, unlink as unlink2, writeFile as writeFile2 } from "node:fs/promises";
+import path6 from "node:path";
 
 // ../tiny-mcp-client/src/internal.ts
 import { spawn as spawn3 } from "node:child_process";
 import { PassThrough as PassThrough2 } from "node:stream";
 
-// ../mcp-oauth/src/client/auth-store-session-store.ts
+// ../mcp-oauth/dist/client/auth-store-session-store.js
 import crypto from "node:crypto";
-import path4 from "node:path";
+import path5 from "node:path";
 
 // ../auth-store/src/encrypted-file-store.ts
 import { createCipheriv, createDecipheriv, randomBytes as randomBytes2, scrypt } from "node:crypto";
 import { promises as fs } from "node:fs";
 import { homedir, hostname as hostname2, userInfo } from "node:os";
-import path3 from "node:path";
+import path4 from "node:path";
 var derivedKeyCache = /* @__PURE__ */ new Map();
 var ENCRYPTION_ALGORITHM = "aes-256-gcm";
 var ENCRYPTION_VERSION = 1;
@@ -3349,7 +3477,7 @@ var EncryptedFileStore = class {
   constructor(input) {
     this.fs = input.fs ?? fs;
     this.salt = input.salt;
-    this.filePath = input.filePath ?? path3.join(
+    this.filePath = input.filePath ?? path4.join(
       (input.getHomeDirectory ?? homedir)(),
       input.defaultDirectory ?? ".auth-store",
       input.defaultFileName ?? "credentials.enc"
@@ -3402,7 +3530,7 @@ var EncryptedFileStore = class {
       authTag: authTag.toString("base64"),
       ciphertext: ciphertext.toString("base64")
     };
-    await this.fs.mkdir(path3.dirname(this.filePath), { recursive: true });
+    await this.fs.mkdir(path4.dirname(this.filePath), { recursive: true });
     await this.fs.writeFile(this.filePath, JSON.stringify(document), {
       encoding: "utf8"
     });
@@ -3640,7 +3768,7 @@ function resolveBackend(input) {
   return "file";
 }
 
-// ../mcp-oauth/src/resource-indicator.ts
+// ../mcp-oauth/dist/resource-indicator.js
 function canonicalizeResourceIndicator(value) {
   let url;
   try {
@@ -3652,7 +3780,7 @@ function canonicalizeResourceIndicator(value) {
   return url.toString();
 }
 
-// ../mcp-oauth/src/client/auth-store-session-store.ts
+// ../mcp-oauth/dist/client/auth-store-session-store.js
 var DEFAULT_FILE_SALT = "poe-code:mcp-oauth:v1";
 var DEFAULT_FILE_DIRECTORY = ".poe-code/mcp-oauth";
 var DEFAULT_KEYCHAIN_SERVICE = "poe-code-mcp-oauth";
@@ -3709,7 +3837,7 @@ function createAuthStoreClientStore(options) {
 }
 function createNamedSecretStore(key2, options, defaults) {
   const hash = crypto.createHash("sha256").update(key2).digest("hex");
-  const parsedFilePath = options.fileStore?.filePath === void 0 ? null : path4.parse(options.fileStore.filePath);
+  const parsedFilePath = options.fileStore?.filePath === void 0 ? null : path5.parse(options.fileStore.filePath);
   const fileStore = {
     ...options.fileStore,
     salt: options.fileStore?.salt ?? defaults.salt,
@@ -3724,37 +3852,29 @@ function createNamedSecretStore(key2, options, defaults) {
   return createSecretStore({ ...options, fileStore, keychainStore }).store;
 }
 function createResourceSecretStore(resource, options) {
-  return createNamedSecretStore(
-    canonicalizeResourceIndicator(resource),
-    options,
-    {
-      salt: DEFAULT_FILE_SALT,
-      directory: DEFAULT_FILE_DIRECTORY,
-      service: DEFAULT_KEYCHAIN_SERVICE,
-      accountPrefix: "provider"
-    }
-  );
+  return createNamedSecretStore(canonicalizeResourceIndicator(resource), options, {
+    salt: DEFAULT_FILE_SALT,
+    directory: DEFAULT_FILE_DIRECTORY,
+    service: DEFAULT_KEYCHAIN_SERVICE,
+    accountPrefix: "provider"
+  });
 }
 function createIssuerSecretStore(issuer, options) {
-  return createNamedSecretStore(
-    issuer,
-    options,
-    {
-      salt: DEFAULT_CLIENT_FILE_SALT,
-      directory: DEFAULT_CLIENT_FILE_DIRECTORY,
-      service: DEFAULT_CLIENT_KEYCHAIN_SERVICE,
-      accountPrefix: "issuer"
-    }
-  );
+  return createNamedSecretStore(issuer, options, {
+    salt: DEFAULT_CLIENT_FILE_SALT,
+    directory: DEFAULT_CLIENT_FILE_DIRECTORY,
+    service: DEFAULT_CLIENT_KEYCHAIN_SERVICE,
+    accountPrefix: "issuer"
+  });
 }
 
-// ../mcp-oauth/src/client/default-oauth-client-provider.ts
+// ../mcp-oauth/dist/client/default-oauth-client-provider.js
 import { URL as URL2 } from "node:url";
 
-// ../mcp-oauth/src/client/loopback-authorization.ts
+// ../mcp-oauth/dist/client/loopback-authorization.js
 import http from "node:http";
 
-// ../mcp-oauth/src/client/authorization-state.ts
+// ../mcp-oauth/dist/client/authorization-state.js
 import crypto2 from "node:crypto";
 function createAuthorizationState(input) {
   const payload = {
@@ -3784,7 +3904,7 @@ function parseAuthorizationState(value) {
   }
 }
 
-// ../mcp-oauth/src/client/loopback-authorization.ts
+// ../mcp-oauth/dist/client/loopback-authorization.js
 async function createLoopbackAuthorizationSession(options = {}) {
   const callbackPath = options.callbackPath ?? "/callback";
   const server = options.createServer ? options.createServer() : http.createServer();
@@ -3857,10 +3977,7 @@ function waitForAuthorizationCode(server, authorizationUrl, options, callbackPat
           return;
         }
         try {
-          const code = validateAuthorizationCallbackParameters(
-            callbackParameters,
-            expectedAuthorization
-          );
+          const code = validateAuthorizationCallbackParameters(callbackParameters, expectedAuthorization);
           settle(() => resolve(code));
         } catch (error2) {
           settle(() => reject(error2 instanceof Error ? error2 : new Error(String(error2))));
@@ -3943,7 +4060,7 @@ function buildSuccessPage(landingPage) {
   ].join("");
 }
 
-// ../mcp-oauth/src/client/pkce.ts
+// ../mcp-oauth/dist/client/pkce.js
 import crypto3 from "node:crypto";
 function generateCodeVerifier() {
   return crypto3.randomBytes(32).toString("base64url");
@@ -3952,7 +4069,7 @@ function generateCodeChallenge(verifier) {
   return crypto3.createHash("sha256").update(verifier).digest("base64url");
 }
 
-// ../mcp-oauth/src/client/token-endpoint.ts
+// ../mcp-oauth/dist/client/token-endpoint.js
 var OAuthError = class extends Error {
   error;
   errorDescription;
@@ -4082,7 +4199,7 @@ function normalizeBearerTokenType(value) {
   return value.toLowerCase() === "bearer" ? "Bearer" : null;
 }
 
-// ../mcp-oauth/src/client/default-oauth-client-provider.ts
+// ../mcp-oauth/dist/client/default-oauth-client-provider.js
 function createOAuthClientProvider(options) {
   if (isProviderOptions(options)) {
     return options.provider;
@@ -4116,16 +4233,10 @@ function createDefaultOAuthClientProvider(options) {
         const resource = canonicalizeResourceIndicator(input.discovery.resource);
         assertRequestMatchesResource(requestUrl, resource);
         const forceRefresh = hasCachedAccessToken(await loadSession(resource)) && input.challenge?.params.error === "invalid_token";
-        const session = await ensureAuthorizedSession(
-          resource,
-          {
-            ...input.discovery,
-            resource
-          },
-          input.fetch,
-          true,
-          forceRefresh
-        );
+        const session = await ensureAuthorizedSession(resource, {
+          ...input.discovery,
+          resource
+        }, input.fetch, true, forceRefresh);
         if (session?.tokens?.accessToken === void 0) {
           return { action: "fail" };
         }
@@ -4190,11 +4301,7 @@ function createDefaultOAuthClientProvider(options) {
               await saveSession(resource, clearedSession);
               return clearedSession;
             }
-            if (shouldReRegisterStoredDynamicClient(
-              error2,
-              await loadRegisteredClient(discovery.authorizationServer),
-              false
-            )) {
+            if (shouldReRegisterStoredDynamicClient(error2, await loadRegisteredClient(discovery.authorizationServer), false)) {
               await clearRegisteredClient(discovery.authorizationServer);
               await clearSession(resource);
               return null;
@@ -4353,10 +4460,7 @@ function createDefaultOAuthClientProvider(options) {
         };
       }
     }
-    const registrationBody = buildClientRegistrationBody(
-      getClientMetadata(options.client),
-      redirectUri
-    );
+    const registrationBody = buildClientRegistrationBody(getClientMetadata(options.client), redirectUri);
     const response = await fetch2(registrationEndpoint, {
       method: "POST",
       headers: {
@@ -4480,9 +4584,7 @@ function buildAuthorizationUrl(input) {
 }
 function assertS256PkceSupport(metadata) {
   if (!metadata.code_challenge_methods_supported.includes("S256")) {
-    throw new Error(
-      "Authorization server metadata must advertise code_challenge_methods_supported including S256"
-    );
+    throw new Error("Authorization server metadata must advertise code_challenge_methods_supported including S256");
   }
 }
 function normalizeHostname(hostname3) {
@@ -4520,9 +4622,7 @@ function assertNoAccessTokenInUrl(value, label) {
 }
 function assertRequestMatchesResource(requestUrl, resource) {
   if (requestUrl !== resource) {
-    throw new Error(
-      `OAuth request URL ${requestUrl} does not match discovered resource ${resource}`
-    );
+    throw new Error(`OAuth request URL ${requestUrl} does not match discovered resource ${resource}`);
   }
 }
 function buildClientRegistrationBody(metadata, redirectUri) {
@@ -4566,13 +4666,8 @@ function shouldReRegisterStoredDynamicClient(error2, client, alreadyAttempted) {
   return true;
 }
 
-// ../mcp-oauth/src/server/jwks-token-verifier.ts
-import {
-  decodeProtectedHeader,
-  errors,
-  importJWK,
-  jwtVerify
-} from "jose";
+// ../mcp-oauth/dist/server/jwks-token-verifier.js
+import { decodeProtectedHeader, errors, importJWK, jwtVerify } from "jose";
 
 // ../tiny-mcp-client/src/oauth-discovery.ts
 function defaultOAuthMetadataFetch(input, init) {
@@ -6647,9 +6742,9 @@ function mergeJsonSchemas(base, overlay) {
     ...mergedRequired === void 0 ? {} : { required: mergedRequired }
   };
 }
-function hasSelfReferencingRef(schema, root, path12 = "#", activePaths = /* @__PURE__ */ new Set()) {
+function hasSelfReferencingRef(schema, root, path13 = "#", activePaths = /* @__PURE__ */ new Set()) {
   const nextActivePaths = new Set(activePaths);
-  nextActivePaths.add(path12);
+  nextActivePaths.add(path13);
   const localRefPath = getLocalRefPath(schema.$ref);
   if (localRefPath !== void 0) {
     if (nextActivePaths.has(localRefPath)) {
@@ -6660,13 +6755,13 @@ function hasSelfReferencingRef(schema, root, path12 = "#", activePaths = /* @__P
       return true;
     }
   }
-  if (schema.items !== void 0 && hasSelfReferencingRef(schema.items, root, `${path12}/items`, nextActivePaths)) {
+  if (schema.items !== void 0 && hasSelfReferencingRef(schema.items, root, `${path13}/items`, nextActivePaths)) {
     return true;
   }
   if (typeof schema.additionalProperties === "object" && schema.additionalProperties !== null && hasSelfReferencingRef(
     schema.additionalProperties,
     root,
-    `${path12}/additionalProperties`,
+    `${path13}/additionalProperties`,
     nextActivePaths
   )) {
     return true;
@@ -6675,7 +6770,7 @@ function hasSelfReferencingRef(schema, root, path12 = "#", activePaths = /* @__P
     if (hasSelfReferencingRef(
       childSchema,
       root,
-      `${path12}/properties/${escapeJsonPointerSegment(key2)}`,
+      `${path13}/properties/${escapeJsonPointerSegment(key2)}`,
       nextActivePaths
     )) {
       return true;
@@ -6685,19 +6780,19 @@ function hasSelfReferencingRef(schema, root, path12 = "#", activePaths = /* @__P
     if (hasSelfReferencingRef(
       childSchema,
       root,
-      `${path12}/$defs/${escapeJsonPointerSegment(key2)}`,
+      `${path13}/$defs/${escapeJsonPointerSegment(key2)}`,
       nextActivePaths
     )) {
       return true;
     }
   }
   for (const [index, childSchema] of (schema.oneOf ?? []).entries()) {
-    if (hasSelfReferencingRef(childSchema, root, `${path12}/oneOf/${index}`, nextActivePaths)) {
+    if (hasSelfReferencingRef(childSchema, root, `${path13}/oneOf/${index}`, nextActivePaths)) {
       return true;
     }
   }
   for (const [index, childSchema] of (schema.anyOf ?? []).entries()) {
-    if (hasSelfReferencingRef(childSchema, root, `${path12}/anyOf/${index}`, nextActivePaths)) {
+    if (hasSelfReferencingRef(childSchema, root, `${path13}/anyOf/${index}`, nextActivePaths)) {
       return true;
     }
   }
@@ -6713,14 +6808,14 @@ function getLocalRefPath(ref) {
   return ref.startsWith("#/") ? ref : void 0;
 }
 function resolveLocalRef(root, ref) {
-  const path12 = getLocalRefPath(ref);
-  if (path12 === void 0) {
+  const path13 = getLocalRefPath(ref);
+  if (path13 === void 0) {
     return void 0;
   }
-  if (path12 === "#") {
+  if (path13 === "#") {
     return root;
   }
-  const segments = path12.slice(2).split("/").map(unescapeJsonPointerSegment);
+  const segments = path13.slice(2).split("/").map(unescapeJsonPointerSegment);
   let current = root;
   for (const segment of segments) {
     if (Array.isArray(current)) {
@@ -6958,7 +7053,7 @@ async function ensureConnected(connection) {
 }
 async function readCache(cachePath) {
   try {
-    const raw = await readFile2(cachePath, "utf8");
+    const raw = await readFile3(cachePath, "utf8");
     const parsed = JSON.parse(raw);
     if (parsed === null || typeof parsed !== "object" || !Array.isArray(parsed.tools) || parsed.upstream === void 0 || typeof parsed.upstream.name !== "string" || typeof parsed.upstream.version !== "string") {
       return void 0;
@@ -6979,7 +7074,7 @@ async function readCache(cachePath) {
   }
 }
 async function writeCache(cachePath, cache) {
-  const directory = path5.dirname(cachePath);
+  const directory = path6.dirname(cachePath);
   const tempPath = `${cachePath}.tmp`;
   await mkdir(directory, { recursive: true });
   await writeFile2(tempPath, `${JSON.stringify(cache, null, 2)}
@@ -7065,7 +7160,7 @@ function isRefreshRequested(name, refresh) {
   }
   return refresh?.has(name) === true;
 }
-async function resolveSingleProxy(group) {
+async function resolveSingleProxy(group, options) {
   const internal = getInternalGroupConfig2(group);
   const config = internal.mcp;
   if (config === void 0) {
@@ -7073,7 +7168,7 @@ async function resolveSingleProxy(group) {
   }
   const name = group.name;
   try {
-    const cachePath = resolveCachePath(name);
+    const cachePath = resolveCachePath(name, options.projectRoot);
     const refresh = parseRefreshEnv(process.env.TOOLCRAFT_MCP_REFRESH);
     let cache;
     if (isRefreshRequested(name, refresh)) {
@@ -7122,14 +7217,14 @@ function collectProxyGroups(root) {
 }
 function resolveCachePath(name, projectRoot) {
   if (projectRoot !== void 0) {
-    return path5.join(projectRoot, ".toolcraft", "mcp", `${name}.json`);
+    return path6.join(projectRoot, ".toolcraft", "mcp", `${name}.json`);
   }
   let current = process.cwd();
   while (true) {
-    if (existsSync(path5.join(current, "package.json"))) {
-      return path5.join(current, ".toolcraft", "mcp", `${name}.json`);
+    if (existsSync2(path6.join(current, "package.json"))) {
+      return path6.join(current, ".toolcraft", "mcp", `${name}.json`);
     }
-    const parent = path5.dirname(current);
+    const parent = path6.dirname(current);
     if (parent === current) {
       throw new Error(
         `Could not find package.json above "${process.cwd()}" while resolving MCP cache path.`
@@ -7167,9 +7262,9 @@ async function dialUpstream(name, config) {
   await client.connect(transport);
   return client;
 }
-async function resolveMcpProxies(root) {
+async function resolveMcpProxies(root, options = {}) {
   const groups = collectProxyGroups(root);
-  await Promise.all(groups.map((group) => resolveSingleProxy(group)));
+  await Promise.all(groups.map((group) => resolveSingleProxy(group, options)));
 }
 
 // ../toolcraft/src/number-schema.ts
@@ -7349,7 +7444,7 @@ function inferProgramName(argv) {
   if (typeof entrypoint !== "string" || entrypoint.length === 0) {
     return "toolcraft";
   }
-  const parsed = path6.parse(entrypoint);
+  const parsed = path7.parse(entrypoint);
   return parsed.name.length > 0 ? parsed.name : "toolcraft";
 }
 function normalizeRoots(roots, argv) {
@@ -7407,11 +7502,11 @@ function formatSegment(segment, casing) {
   const separator = casing === "snake" ? "_" : "-";
   return splitWords(segment).join(separator);
 }
-function toOptionFlag(path12, casing) {
-  return `--${path12.map((segment) => formatSegment(segment, casing)).join(".")}`;
+function toOptionFlag(path13, casing) {
+  return `--${path13.map((segment) => formatSegment(segment, casing)).join(".")}`;
 }
-function toOptionAttribute(path12, casing) {
-  return path12.map((segment) => {
+function toOptionAttribute(path13, casing) {
+  return path13.map((segment) => {
     const formatted = formatSegment(segment, casing);
     if (casing === "snake") {
       return formatted;
@@ -7422,23 +7517,23 @@ function toOptionAttribute(path12, casing) {
     ).join("");
   }).join(".");
 }
-function toDisplayPath(path12) {
-  return path12.join(".");
+function toDisplayPath(path13) {
+  return path13.join(".");
 }
-function toUnionKindControlPath(path12) {
-  if (path12.length === 0) {
+function toUnionKindControlPath(path13) {
+  if (path13.length === 0) {
     return ["kind"];
   }
-  const head = path12.slice(0, -1);
-  const tail = path12[path12.length - 1] ?? "";
+  const head = path13.slice(0, -1);
+  const tail = path13[path13.length - 1] ?? "";
   return [...head, `${tail}Kind`];
 }
-function toUnionKindDisplayPath(path12) {
-  if (path12.length === 0) {
+function toUnionKindDisplayPath(path13) {
+  if (path13.length === 0) {
     return "kind";
   }
-  const head = path12.slice(0, -1);
-  const tail = path12[path12.length - 1] ?? "";
+  const head = path13.slice(0, -1);
+  const tail = path13[path13.length - 1] ?? "";
   return [...head, `${tail}-kind`].join(".");
 }
 function createSyntheticEnumSchema(values) {
@@ -7454,19 +7549,19 @@ function getRequiredBranchFingerprint(branch, casing) {
   const requiredKeys = Object.entries(branch.shape).filter(([, schema]) => schema.kind !== "optional").map(([key2]) => formatSegment(key2, casing)).sort();
   return requiredKeys.join("+");
 }
-function collectFields(schema, casing, path12 = [], inheritedOptional = false, variantContext) {
+function collectFields(schema, casing, globalLongOptionFlags, path13 = [], inheritedOptional = false, variantContext) {
   const collected = {
     dynamicFields: [],
     fields: [],
     variants: []
   };
   for (const [key2, rawChildSchema] of Object.entries(schema.shape)) {
-    const nextPath = [...path12, key2];
+    const nextPath = [...path13, key2];
     const runtimeOptional = inheritedOptional || rawChildSchema.kind === "optional";
     const childSchema = unwrapOptional(rawChildSchema);
     const requiredWhenActive = rawChildSchema.kind !== "optional" && childSchema.default === void 0;
     if (childSchema.kind === "object") {
-      const nested = collectFields(childSchema, casing, nextPath, runtimeOptional, variantContext);
+      const nested = collectFields(childSchema, casing, globalLongOptionFlags, nextPath, runtimeOptional, variantContext);
       collected.dynamicFields.push(...nested.dynamicFields);
       collected.fields.push(...nested.fields);
       collected.variants.push(...nested.variants);
@@ -7480,7 +7575,7 @@ function collectFields(schema, casing, path12 = [], inheritedOptional = false, v
         path: [...nextPath, childSchema.discriminator],
         displayPath: toDisplayPath([...nextPath, childSchema.discriminator]),
         optionAttribute: toOptionAttribute([...nextPath, childSchema.discriminator], casing),
-        commanderOptionAttribute: toCommanderOptionAttribute([...nextPath, childSchema.discriminator], casing),
+        commanderOptionAttribute: toCommanderOptionAttribute([...nextPath, childSchema.discriminator], casing, globalLongOptionFlags),
         optionFlag: toOptionFlag([...nextPath, childSchema.discriminator], casing),
         shortFlag: void 0,
         schema: createSyntheticEnumSchema(branchIds),
@@ -7493,7 +7588,7 @@ function collectFields(schema, casing, path12 = [], inheritedOptional = false, v
       collected.fields.push(controlField);
       const branches = [];
       for (const [branchId, branchSchema] of Object.entries(childSchema.branches)) {
-        const branch = collectFields(branchSchema, casing, nextPath, true, {
+        const branch = collectFields(branchSchema, casing, globalLongOptionFlags, nextPath, true, {
           id: variantId,
           branchId
         });
@@ -7527,7 +7622,7 @@ function collectFields(schema, casing, path12 = [], inheritedOptional = false, v
         path: controlPath,
         displayPath: controlDisplayPath,
         optionAttribute: toOptionAttribute(controlPath, casing),
-        commanderOptionAttribute: toCommanderOptionAttribute(controlPath, casing),
+        commanderOptionAttribute: toCommanderOptionAttribute(controlPath, casing, globalLongOptionFlags),
         optionFlag: toOptionFlag(controlPath, casing),
         shortFlag: void 0,
         schema: createSyntheticEnumSchema(branchIds),
@@ -7542,7 +7637,7 @@ function collectFields(schema, casing, path12 = [], inheritedOptional = false, v
       const branches = [];
       childSchema.branches.forEach((branchSchema, index) => {
         const branchId = branchIds[index] ?? "";
-        const branch = collectFields(branchSchema, casing, nextPath, true, {
+        const branch = collectFields(branchSchema, casing, globalLongOptionFlags, nextPath, true, {
           id: variantId,
           branchId
         });
@@ -7609,7 +7704,7 @@ function collectFields(schema, casing, path12 = [], inheritedOptional = false, v
       path: nextPath,
       displayPath: toDisplayPath(nextPath),
       optionAttribute: toOptionAttribute(nextPath, casing),
-      commanderOptionAttribute: toCommanderOptionAttribute(nextPath, casing),
+      commanderOptionAttribute: toCommanderOptionAttribute(nextPath, casing, globalLongOptionFlags),
       optionFlag: toOptionFlag(nextPath, casing),
       shortFlag: childSchema.short,
       schema: childSchema,
@@ -7624,10 +7719,10 @@ function collectFields(schema, casing, path12 = [], inheritedOptional = false, v
   }
   return collected;
 }
-function toCommanderOptionAttribute(path12, casing) {
-  const optionAttribute = toOptionAttribute(path12, casing);
-  const optionFlag = toOptionFlag(path12, casing);
-  if (!GLOBAL_LONG_OPTION_FLAGS.has(optionFlag)) {
+function toCommanderOptionAttribute(path13, casing, globalLongOptionFlags) {
+  const optionAttribute = toOptionAttribute(path13, casing);
+  const optionFlag = toOptionFlag(path13, casing);
+  if (!globalLongOptionFlags.has(optionFlag)) {
     return optionAttribute;
   }
   return `param_${optionAttribute}`;
@@ -7657,8 +7752,8 @@ function assignPositionals(fields, positional) {
   });
   return fields;
 }
-function formatOptionFlags(field) {
-  const collidesWithGlobalFlag = GLOBAL_LONG_OPTION_FLAGS.has(field.optionFlag);
+function formatOptionFlags(field, globalLongOptionFlags) {
+  const collidesWithGlobalFlag = globalLongOptionFlags.has(field.optionFlag);
   if (collidesWithGlobalFlag) {
     if (field.shortFlag === void 0) {
       throw new UserError(
@@ -7776,9 +7871,9 @@ function parseArrayValue(value, schema, label) {
   }
   return splitArrayInput(value).map((item) => parseScalarValue(item, itemSchema, label));
 }
-function createOption(field) {
-  const flags = formatOptionFlags(field);
-  const collidesWithGlobalFlag = GLOBAL_LONG_OPTION_FLAGS.has(field.optionFlag);
+function createOption(field, globalLongOptionFlags) {
+  const flags = formatOptionFlags(field, globalLongOptionFlags);
+  const collidesWithGlobalFlag = globalLongOptionFlags.has(field.optionFlag);
   const commanderValue = (value) => value === null ? NULL_OPTION_VALUE : value;
   if (field.schema.kind === "boolean") {
     if (collidesWithGlobalFlag) {
@@ -7823,7 +7918,10 @@ function createOption(field) {
   );
   return [option];
 }
-var GLOBAL_LONG_OPTION_FLAGS = /* @__PURE__ */ new Set(["--preset", "--yes", "--output", "--verbose"]);
+var ALWAYS_GLOBAL_LONG_OPTION_FLAGS = ["--yes", "--output", "--verbose"];
+function getGlobalLongOptionFlags(presetsEnabled) {
+  return new Set(presetsEnabled ? ["--preset", ...ALWAYS_GLOBAL_LONG_OPTION_FLAGS] : ALWAYS_GLOBAL_LONG_OPTION_FLAGS);
+}
 function createCommanderOption(flags, description, field) {
   const option = new Option(flags, description);
   if (field.commanderOptionAttribute !== field.optionAttribute) {
@@ -7917,14 +8015,14 @@ function describeSchemaType(schema) {
       throw new UserError("Unsupported CLI schema kind.");
   }
 }
-function formatHelpFieldFlags(field) {
+function formatHelpFieldFlags(field, globalLongOptionFlags) {
   if (field.positionalIndex !== void 0) {
     return formatPositionalToken(field);
   }
   if (field.schema.kind === "boolean") {
-    return `${formatOptionFlags(field)} [value]`;
+    return `${formatOptionFlags(field, globalLongOptionFlags)} [value]`;
   }
-  return `${formatOptionFlags(field)} <${describeSchemaType(field.schema)}>`;
+  return `${formatOptionFlags(field, globalLongOptionFlags)} <${describeSchemaType(field.schema)}>`;
 }
 function appendHelpMetadata(description, metadata) {
   if (metadata.length === 0) {
@@ -8066,18 +8164,52 @@ function formatSecretDescription(secret) {
   }
   return secret.optional === true ? "Optional secret" : "Required secret";
 }
-function formatCommandRows(group, scope) {
-  return getVisibleChildren(group, scope).map((child) => ({
-    name: child.aliases.length === 0 ? child.name : `${child.name} (${child.aliases.join(", ")})`,
-    description: child.description ?? ""
-  }));
+function wrapOptionalCommandParameterToken(token, optional) {
+  return optional ? `[${token}]` : token;
 }
-function formatGlobalOptionRows(showVersion) {
-  const rows = [
-    {
+function formatCommandDynamicParameterTokens(field, casing) {
+  const optional = field.optional || field.hasDefault;
+  return formatDynamicHelpFields(field, casing).map(
+    (row) => wrapOptionalCommandParameterToken(row.flags, optional)
+  );
+}
+function formatCommandParameterTokens(command, casing, globalLongOptionFlags) {
+  const collected = collectFields(command.params, casing, globalLongOptionFlags);
+  const fields = assignPositionals(collected.fields, command.positional);
+  return fields.map(
+    (field) => wrapOptionalCommandParameterToken(
+      formatHelpFieldFlags(field, globalLongOptionFlags),
+      field.positionalIndex === void 0 && (field.optional || field.hasDefault)
+    )
+  ).concat(collected.dynamicFields.flatMap((field) => formatCommandDynamicParameterTokens(field, casing)));
+}
+function formatCommandRowName(node, depth, casing, globalLongOptionFlags) {
+  const baseName = node.aliases.length === 0 ? node.name : `${node.name} (${node.aliases.join(", ")})`;
+  const parameterTokens = node.kind === "command" ? formatCommandParameterTokens(node, casing, globalLongOptionFlags) : [];
+  const name = parameterTokens.length === 0 ? baseName : `${baseName} ${parameterTokens.join(" ")}`;
+  return `${"  ".repeat(depth)}${name}`;
+}
+function formatCommandRows(group, scope, casing, globalLongOptionFlags, depth = 0) {
+  return getVisibleChildren(group, scope).flatMap((child) => {
+    const row = {
+      name: formatCommandRowName(child, depth, casing, globalLongOptionFlags),
+      description: child.description ?? ""
+    };
+    if (child.kind === "command") {
+      return [row];
+    }
+    return [row, ...formatCommandRows(child, scope, casing, globalLongOptionFlags, depth + 1)];
+  });
+}
+function formatGlobalOptionRows(showVersion, presetsEnabled) {
+  const rows = [];
+  if (presetsEnabled) {
+    rows.push({
       flags: "--preset <path>",
       description: "Load parameter defaults from a JSON file"
-    },
+    });
+  }
+  rows.push(
     {
       flags: "--yes",
       description: "Accept defaults, skip prompts"
@@ -8090,7 +8222,7 @@ function formatGlobalOptionRows(showVersion) {
       flags: "-h, --help",
       description: "Show help"
     }
-  ];
+  );
   if (showVersion) {
     rows.push({
       flags: "--version",
@@ -8109,15 +8241,16 @@ function buildUsageLine(breadcrumb, rootUsageName, suffix) {
   const subPath = breadcrumb.slice(1).join(" ");
   return subPath ? `${rootUsageName} ${subPath} ${suffix}` : `${rootUsageName} ${suffix}`;
 }
-function renderGroupHelp(group, breadcrumb, scope, showVersion, rootUsageName) {
+function renderGroupHelp(group, breadcrumb, scope, casing, showVersion, presetsEnabled, rootUsageName) {
   const sections = [];
-  const commandRows = formatCommandRows(group, scope);
+  const globalLongOptionFlags = getGlobalLongOptionFlags(presetsEnabled);
+  const commandRows = formatCommandRows(group, scope, casing, globalLongOptionFlags);
   if (commandRows.length > 0) {
     sections.push(`${text.section("Commands:")}
 ${formatCommandList(commandRows)}`);
   }
   sections.push(`${text.section("Global options:")}
-${formatOptionList(formatGlobalOptionRows(showVersion))}`);
+${formatOptionList(formatGlobalOptionRows(showVersion, presetsEnabled))}`);
   return renderHelpDocument({
     breadcrumb,
     usageLine: buildUsageLine(breadcrumb, rootUsageName, "[options] [command]"),
@@ -8126,12 +8259,13 @@ ${formatOptionList(formatGlobalOptionRows(showVersion))}`);
     sections
   });
 }
-function renderLeafHelp(command, breadcrumb, casing, rootUsageName) {
+function renderLeafHelp(command, breadcrumb, casing, presetsEnabled, rootUsageName) {
   const sections = [];
-  const collected = collectFields(command.params, casing);
+  const globalLongOptionFlags = getGlobalLongOptionFlags(presetsEnabled);
+  const collected = collectFields(command.params, casing, globalLongOptionFlags);
   const fields = assignPositionals(collected.fields, command.positional);
   const optionRows = fields.map((field) => ({
-    flags: formatHelpFieldFlags(field),
+    flags: formatHelpFieldFlags(field, globalLongOptionFlags),
     description: formatHelpFieldDescription(field)
   })).concat(collected.dynamicFields.flatMap((field) => formatDynamicHelpFields(field, casing)));
   if (optionRows.length > 0) {
@@ -8139,7 +8273,7 @@ function renderLeafHelp(command, breadcrumb, casing, rootUsageName) {
 ${formatOptionList(optionRows)}`);
   }
   sections.push(`${text.section("Global options:")}
-${formatOptionList(formatGlobalOptionRows(false))}`);
+${formatOptionList(formatGlobalOptionRows(false, presetsEnabled))}`);
   const secretRows = formatSecretRows(command.secrets);
   if (secretRows.length > 0) {
     sections.push(`${text.section("Secrets (via environment):")}
@@ -8178,25 +8312,33 @@ async function renderGeneratedHelp(root, argv, options) {
   const output = resolveHelpOutput(argv);
   const casing = options.casing ?? "kebab";
   await withOutputFormat2(output, async () => {
-    const rendered = target.node.kind === "group" ? renderGroupHelp(target.node, target.breadcrumb, "cli", options.version !== void 0, options.rootUsageName) : renderLeafHelp(target.node, target.breadcrumb, casing, options.rootUsageName);
+    const rendered = target.node.kind === "group" ? renderGroupHelp(
+      target.node,
+      target.breadcrumb,
+      "cli",
+      casing,
+      options.version !== void 0,
+      options.presets === true,
+      options.rootUsageName
+    ) : renderLeafHelp(target.node, target.breadcrumb, casing, options.presets === true, options.rootUsageName);
     process.stdout.write(rendered);
   });
 }
-function createNodeCommand(node, casing, execute, pathSegments = []) {
+function createNodeCommand(node, casing, globalLongOptionFlags, execute, presetsEnabled, pathSegments = []) {
   const nextPathSegments = [...pathSegments, node.name];
   if (node.kind === "command") {
     if (!node.scope.includes("cli")) {
       return null;
     }
     const command = new CommanderCommand(node.name);
-    const collected = collectFields(node.params, casing);
+    const collected = collectFields(node.params, casing, globalLongOptionFlags);
     const fields = assignPositionals(collected.fields, node.positional);
     if (node.description !== void 0) {
       command.description(node.description);
     }
     node.aliases.forEach((alias) => command.alias(alias));
     command.addHelpCommand(false);
-    addGlobalOptions(command);
+    addGlobalOptions(command, presetsEnabled);
     command.allowExcessArguments(true);
     if (collected.dynamicFields.length > 0) {
       command.allowUnknownOption(true);
@@ -8206,7 +8348,7 @@ function createNodeCommand(node, casing, execute, pathSegments = []) {
         command.argument(formatPositionalToken(field));
         continue;
       }
-      for (const option of createOption(field)) {
+      for (const option of createOption(field, globalLongOptionFlags)) {
         command.addOption(option);
       }
     }
@@ -8220,6 +8362,7 @@ function createNodeCommand(node, casing, execute, pathSegments = []) {
         dynamicFields: collected.dynamicFields,
         fields,
         positionalValues,
+        presetsEnabled,
         rawArgv: actionCommand.args,
         actionCommand,
         variants: collected.variants
@@ -8230,22 +8373,25 @@ function createNodeCommand(node, casing, execute, pathSegments = []) {
   if (!isNodeVisibleInScope(node, "cli")) {
     return null;
   }
-  const visibleChildren = node.children.map((child) => createNodeCommand(child, casing, execute, nextPathSegments)).filter((child) => child !== null);
+  const visibleChildren = node.children.map((child) => createNodeCommand(child, casing, globalLongOptionFlags, execute, presetsEnabled, nextPathSegments)).filter((child) => child !== null);
   const group = new CommanderCommand(node.name);
   if (node.description !== void 0) {
     group.description(node.description);
   }
   node.aliases.forEach((alias) => group.alias(alias));
   group.addHelpCommand(false);
-  addGlobalOptions(group);
+  addGlobalOptions(group, presetsEnabled);
   for (const child of visibleChildren) {
     const isDefaultChild = node.default !== void 0 && node.default.scope.includes("cli") && (child.name() === node.default.name || child.aliases().includes(node.default.name));
     group.addCommand(child, isDefaultChild ? { isDefault: true } : void 0);
   }
   return group;
 }
-function addGlobalOptions(command) {
-  command.option("--preset <path>", "Load parameter defaults from a JSON file.").option("--yes", "Accept defaults and skip prompts.").option("--output <format>", "Output format.", (value) => {
+function addGlobalOptions(command, presetsEnabled) {
+  if (presetsEnabled) {
+    command.option("--preset <path>", "Load parameter defaults from a JSON file.");
+  }
+  command.option("--yes", "Accept defaults and skip prompts.").option("--output <format>", "Output format.", (value) => {
     if (value === "rich" || value === "md" || value === "json") {
       return value;
     }
@@ -8255,10 +8401,10 @@ function addGlobalOptions(command) {
     throw new InvalidArgumentError('Invalid value for "--output". Expected one of: rich, md, markdown, json.');
   }).option("--verbose", "Print stack traces for unexpected errors.");
 }
-function setNestedValue(target, path12, value) {
+function setNestedValue(target, path13, value) {
   let cursor = target;
-  for (let index = 0; index < path12.length - 1; index += 1) {
-    const segment = path12[index] ?? "";
+  for (let index = 0; index < path13.length - 1; index += 1) {
+    const segment = path13[index] ?? "";
     const existing = cursor[segment];
     if (typeof existing === "object" && existing !== null) {
       cursor = existing;
@@ -8268,7 +8414,7 @@ function setNestedValue(target, path12, value) {
     cursor[segment] = next;
     cursor = next;
   }
-  const leaf = path12[path12.length - 1];
+  const leaf = path13[path13.length - 1];
   if (leaf !== void 0) {
     cursor[leaf] = value;
   }
@@ -8370,13 +8516,13 @@ async function withOutputFormat2(output, fn) {
 }
 function createFs2() {
   return {
-    readFile: async (path12, encoding = "utf8") => readFile3(path12, { encoding }),
-    writeFile: async (path12, contents) => {
-      await writeFile3(path12, contents);
+    readFile: async (path13, encoding = "utf8") => readFile4(path13, { encoding }),
+    writeFile: async (path13, contents) => {
+      await writeFile3(path13, contents);
     },
-    exists: async (path12) => {
+    exists: async (path13) => {
       try {
-        await access2(path12);
+        await access2(path13);
         return true;
       } catch {
         return false;
@@ -8397,9 +8543,9 @@ function isPlainObject2(value) {
 function hasFieldValue(value) {
   return value !== void 0;
 }
-function hasNestedField(fields, path12) {
+function hasNestedField(fields, path13) {
   return fields.some(
-    (field) => path12.length < field.path.length && path12.every((segment, index) => field.path[index] === segment)
+    (field) => path13.length < field.path.length && path13.every((segment, index) => field.path[index] === segment)
   );
 }
 function describeExpectedPresetValue(schema) {
@@ -8474,7 +8620,7 @@ function validatePresetFieldValue(value, field, presetPath) {
 async function loadPresetValues(fields, presetPath) {
   let rawPreset;
   try {
-    rawPreset = await readFile3(presetPath, {
+    rawPreset = await readFile4(presetPath, {
       encoding: "utf8"
     });
   } catch (error2) {
@@ -8495,9 +8641,9 @@ async function loadPresetValues(fields, presetPath) {
   }
   const fieldByPath = new Map(fields.map((field) => [field.displayPath, field]));
   const presetValues = {};
-  function visitObject(current, path12) {
+  function visitObject(current, path13) {
     for (const [key2, value] of Object.entries(current)) {
-      const nextPath = [...path12, key2];
+      const nextPath = [...path13, key2];
       const displayPath = toDisplayPath(nextPath);
       const field = fieldByPath.get(displayPath);
       if (field !== void 0) {
@@ -8695,8 +8841,8 @@ function createFixtureService(definition) {
   );
 }
 function resolveFixturePath(commandPath) {
-  const parsed = path6.parse(commandPath);
-  return path6.join(parsed.dir, `${parsed.name}.fixture.json`);
+  const parsed = path7.parse(commandPath);
+  return path7.join(parsed.dir, `${parsed.name}.fixture.json`);
 }
 function selectFixtureScenario(scenarios, selector) {
   if (isNumericFixtureSelector(selector)) {
@@ -8723,7 +8869,7 @@ async function loadFixtureScenario(command, selector) {
   const fixturePath = resolveFixturePath(commandPath);
   let rawFixture;
   try {
-    rawFixture = await readFile3(fixturePath, {
+    rawFixture = await readFile4(fixturePath, {
       encoding: "utf8"
     });
   } catch {
@@ -8819,8 +8965,8 @@ function validateServices(services) {
     }
   }
 }
-function getNestedValue(target, path12) {
-  return path12.reduce(
+function getNestedValue(target, path13) {
+  return path13.reduce(
     (current, segment) => current !== null && typeof current === "object" ? current[segment] : void 0,
     target
   );
@@ -9286,7 +9432,7 @@ async function executeCommand(state, services, requirementOptions, runtimeOption
       optionValues,
       state.rawArgv,
       state.casing,
-      resolvedFlags.preset,
+      state.presetsEnabled ? resolvedFlags.preset : void 0,
       shouldPrompt
     );
     const context = {
@@ -9350,10 +9496,11 @@ function handleRunError(error2, verbose) {
 }
 async function runCLI(roots, options = {}) {
   const root = mergeApprovalsGroup(normalizeRoots(roots, process.argv));
-  await resolveMcpProxies(root);
+  await resolveMcpProxies(root, { projectRoot: options.projectRoot });
   const casing = options.casing ?? "kebab";
   const services = options.services ?? {};
   const runtimeOptions = options.humanInLoop ?? {};
+  const version = options.version ?? findEntrypointPackageMetadata(process.argv[1])?.version;
   const servicesWithBuiltIns = {
     ...services,
     runtimeOptions,
@@ -9364,7 +9511,7 @@ async function runCLI(roots, options = {}) {
   };
   validateServices(services);
   if (hasHelpFlag(process.argv)) {
-    await renderGeneratedHelp(root, process.argv, options);
+    await renderGeneratedHelp(root, process.argv, { ...options, version });
     return;
   }
   const program = new CommanderCommand();
@@ -9372,9 +9519,11 @@ async function runCLI(roots, options = {}) {
   program.exitOverride();
   program.showHelpAfterError();
   program.addHelpCommand(false);
-  addGlobalOptions(program);
-  if (options.version !== void 0) {
-    program.version(options.version, "--version");
+  const presetsEnabled = options.presets === true;
+  const globalLongOptionFlags = getGlobalLongOptionFlags(presetsEnabled);
+  addGlobalOptions(program, presetsEnabled);
+  if (version !== void 0) {
+    program.version(version, "--version");
   }
   let lastActionCommand;
   const execute = async (state) => {
@@ -9382,7 +9531,7 @@ async function runCLI(roots, options = {}) {
     await executeCommand(state, servicesWithBuiltIns, requirementOptions, runtimeOptions);
   };
   for (const child of root.children) {
-    const command = createNodeCommand(child, casing, execute);
+    const command = createNodeCommand(child, casing, globalLongOptionFlags, execute, presetsEnabled);
     if (command === null) {
       continue;
     }
@@ -10680,7 +10829,7 @@ var getSession = defineCommand({
 
 // ../agent-skill-config/src/configs.ts
 import os2 from "node:os";
-import path7 from "node:path";
+import path8 from "node:path";
 
 // ../agent-defs/src/agents/claude-code.ts
 var claudeCodeAgent = {
@@ -11201,20 +11350,20 @@ function getConfigFormat(pathOrFormat) {
   }
   return formatRegistry[formatName];
 }
-function detectFormat(path12) {
-  const ext = getExtension(path12);
+function detectFormat(path13) {
+  const ext = getExtension(path13);
   return extensionMap[ext];
 }
-function getExtension(path12) {
-  const lastDot = path12.lastIndexOf(".");
+function getExtension(path13) {
+  const lastDot = path13.lastIndexOf(".");
   if (lastDot === -1) {
     return "";
   }
-  return path12.slice(lastDot).toLowerCase();
+  return path13.slice(lastDot).toLowerCase();
 }
 
 // ../config-mutations/src/execution/path-utils.ts
-import path8 from "node:path";
+import path9 from "node:path";
 function expandHome(targetPath, homeDir) {
   if (!targetPath?.startsWith("~")) {
     return targetPath;
@@ -11231,7 +11380,7 @@ function expandHome(targetPath, homeDir) {
       remainder = remainder.slice(1);
     }
   }
-  return remainder.length === 0 ? homeDir : path8.join(homeDir, remainder);
+  return remainder.length === 0 ? homeDir : path9.join(homeDir, remainder);
 }
 function validateHomePath(targetPath) {
   if (typeof targetPath !== "string" || targetPath.length === 0) {
@@ -11249,12 +11398,12 @@ function resolvePath(rawPath, homeDir, pathMapper) {
   if (!pathMapper) {
     return expanded;
   }
-  const rawDirectory = path8.dirname(expanded);
+  const rawDirectory = path9.dirname(expanded);
   const mappedDirectory = pathMapper.mapTargetDirectory({
     targetDirectory: rawDirectory
   });
-  const filename = path8.basename(expanded);
-  return filename.length === 0 ? mappedDirectory : path8.join(mappedDirectory, filename);
+  const filename = path9.basename(expanded);
+  return filename.length === 0 ? mappedDirectory : path9.join(mappedDirectory, filename);
 }
 
 // ../config-mutations/src/fs-utils.ts
@@ -11861,9 +12010,9 @@ import Mustache2 from "mustache";
 var originalEscape = Mustache2.escape;
 
 // ../agent-skill-config/src/templates.ts
-import { readFile as readFile4, stat as stat2 } from "node:fs/promises";
-import path9 from "node:path";
-import { fileURLToPath as fileURLToPath2 } from "node:url";
+import { readFile as readFile5, stat as stat2 } from "node:fs/promises";
+import path10 from "node:path";
+import { fileURLToPath as fileURLToPath3 } from "node:url";
 
 // ../agent-skill-config/src/apply.ts
 var UnsupportedAgentError = class extends Error {
@@ -11921,9 +12070,9 @@ async function installSkill(agentId, skill, options) {
 
 // src/commands/installer.ts
 import os3 from "node:os";
-import path10 from "node:path";
+import path11 from "node:path";
 import * as nodeFs from "node:fs/promises";
-import { readFile as readFile5 } from "node:fs/promises";
+import { readFile as readFile6 } from "node:fs/promises";
 var DEFAULT_INSTALL_AGENT = "claude-code";
 var DEFAULT_INSTALL_SCOPE = "local";
 var TERMINAL_PILOT_SKILL_NAME = "terminal-pilot";
@@ -11973,7 +12122,7 @@ async function loadTerminalPilotTemplate() {
   ];
   for (const candidate of candidates) {
     try {
-      terminalPilotTemplateCache = await readFile5(candidate, "utf8");
+      terminalPilotTemplateCache = await readFile6(candidate, "utf8");
       return terminalPilotTemplateCache;
     } catch (error2) {
       if (!isNotFoundError2(error2)) {
@@ -11988,7 +12137,7 @@ function resolveHomeRelativePath(targetPath, homeDir) {
     return homeDir;
   }
   if (targetPath.startsWith("~/")) {
-    return path10.join(homeDir, targetPath.slice(2));
+    return path11.join(homeDir, targetPath.slice(2));
   }
   return targetPath;
 }
@@ -11998,12 +12147,12 @@ function getSkillFolderWithHome(agent, scope, cwd, homeDir) {
     throwUnsupportedAgent(agent);
   }
   return {
-    displayPath: path10.join(
+    displayPath: path11.join(
       scope === "global" ? config.globalSkillDir : config.localSkillDir,
       TERMINAL_PILOT_SKILL_NAME
     ),
-    fullPath: path10.join(
-      scope === "global" ? resolveHomeRelativePath(config.globalSkillDir, homeDir) : path10.resolve(cwd, config.localSkillDir),
+    fullPath: path11.join(
+      scope === "global" ? resolveHomeRelativePath(config.globalSkillDir, homeDir) : path11.resolve(cwd, config.localSkillDir),
       TERMINAL_PILOT_SKILL_NAME
     )
   };
@@ -12407,18 +12556,18 @@ function parseAnsi2(input) {
 import { Resvg } from "@resvg/resvg-js";
 
 // ../terminal-png/src/font.ts
-import { readFileSync } from "node:fs";
+import { readFileSync as readFileSync2 } from "node:fs";
 import { createRequire as createRequire2 } from "node:module";
 import { dirname as dirname2, join as join2 } from "node:path";
-import { fileURLToPath as fileURLToPath3 } from "node:url";
+import { fileURLToPath as fileURLToPath4 } from "node:url";
 var require2 = createRequire2(import.meta.url);
 var fontPackageRoot = dirname2(require2.resolve("jetbrains-mono/package.json"));
 var webfontRoot = join2(fontPackageRoot, "fonts/webfonts");
 function readWebfontBase64(filename) {
-  return readFileSync(join2(webfontRoot, filename)).toString("base64");
+  return readFileSync2(join2(webfontRoot, filename)).toString("base64");
 }
 function resolveAssetPath(filename) {
-  return fileURLToPath3(new URL(`../assets/${filename}`, import.meta.url));
+  return fileURLToPath4(new URL(`../assets/${filename}`, import.meta.url));
 }
 function createFontFace(base64, weight, style) {
   return `@font-face {
@@ -13114,9 +13263,9 @@ async function isDirectExecution(argv) {
     return false;
   }
   try {
-    const modulePath = fileURLToPath4(import.meta.url);
+    const modulePath = fileURLToPath5(import.meta.url);
     const [resolvedEntryPoint, resolvedModulePath] = await Promise.all([
-      realpath(path11.resolve(entryPoint)),
+      realpath(path12.resolve(entryPoint)),
       realpath(modulePath)
     ]);
     return resolvedEntryPoint === resolvedModulePath;