@hasna/skills 0.1.46 → 0.1.48

package/bin/index.js

@@ -9553,7 +9553,7 @@ Learn more about this warning here: https://reactjs.org/link/legacy-context`, so
 
 ` + ("" + errorBoundaryMessage);
             console["error"](combinedMessage);
-          }
+          } else {}
         } catch (e) {
           setTimeout(function() {
             throw e;
@@ -18037,7 +18037,7 @@ var require_backend = __commonJS((exports, module) => {
         987: (module2, __unused_webpack_exports, __webpack_require__2) => {
           if (true) {
             module2.exports = __webpack_require__2(786);
-          }
+          } else {}
         },
         126: (__unused_webpack_module, exports2, __webpack_require__2) => {
           var process3 = __webpack_require__2(169);
@@ -18487,7 +18487,7 @@ var require_backend = __commonJS((exports, module) => {
         189: (module2, __unused_webpack_exports, __webpack_require__2) => {
           if (true) {
             module2.exports = __webpack_require__2(126);
-          }
+          } else {}
         },
         206: function(module2, exports2, __webpack_require__2) {
           var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;
@@ -18502,7 +18502,7 @@ var require_backend = __commonJS((exports, module) => {
           (function(root, factory) {
             if (true) {
               __WEBPACK_AMD_DEFINE_ARRAY__ = [__webpack_require__2(430)], __WEBPACK_AMD_DEFINE_FACTORY__ = factory, __WEBPACK_AMD_DEFINE_RESULT__ = typeof __WEBPACK_AMD_DEFINE_FACTORY__ === "function" ? __WEBPACK_AMD_DEFINE_FACTORY__.apply(exports2, __WEBPACK_AMD_DEFINE_ARRAY__) : __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module2.exports = __WEBPACK_AMD_DEFINE_RESULT__);
-            }
+            } else {}
           })(this, function ErrorStackParser(StackFrame) {
             var FIREFOX_SAFARI_STACK_REGEXP = /(^|@)\S+:\d+/;
             var CHROME_IE_STACK_REGEXP = /^\s*at .*(\S+:\d+|\(native\))/m;
@@ -19198,7 +19198,7 @@ var require_backend = __commonJS((exports, module) => {
           (function(root, factory) {
             if (true) {
               __WEBPACK_AMD_DEFINE_ARRAY__ = [], __WEBPACK_AMD_DEFINE_FACTORY__ = factory, __WEBPACK_AMD_DEFINE_RESULT__ = typeof __WEBPACK_AMD_DEFINE_FACTORY__ === "function" ? __WEBPACK_AMD_DEFINE_FACTORY__.apply(exports2, __WEBPACK_AMD_DEFINE_ARRAY__) : __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module2.exports = __WEBPACK_AMD_DEFINE_RESULT__);
-            }
+            } else {}
           })(this, function() {
             function _isNumber(n) {
               return !isNaN(parseFloat(n)) && isFinite(n);
@@ -24572,7 +24572,7 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
           var suffix = "";
           if (true) {
             suffix = " (<anonymous>)";
-          }
+          } else {}
           return `
 ` + prefix + name + suffix;
         }
@@ -27301,7 +27301,7 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
                     hasChanges = true;
                     updateMostRecentlyInspectedElementIfNecessary(devtoolsInstance.id);
                   }
-                }
+                } else {}
               }
             } catch (err) {
               _iterator2.e(err);
@@ -29080,7 +29080,7 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
                       if (contentFiber === null) {
                         throw new Error("There should always be an Offscreen Fiber child in a hydrated Suspense boundary.");
                       }
-                    }
+                    } else {}
                     var _isTimedOut = fiber.memoizedState !== null;
                     if (!_isTimedOut) {
                       newSuspenseNode.rects = measureInstance(newInstance);
@@ -29114,7 +29114,7 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
                     if (_contentFiber === null) {
                       throw new Error("There should always be an Offscreen Fiber child in a hydrated Suspense boundary.");
                     }
-                  }
+                  } else {}
                   var suspenseState = fiber.memoizedState;
                   var _isTimedOut3 = suspenseState !== null;
                   if (!_isTimedOut3) {
@@ -29214,7 +29214,7 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
                   trackThrownPromisesFromRetryCache(newSuspenseNode, fiber.stateNode);
                   mountSuspenseChildrenRecursively(_contentFiber2, traceNearestHostComponentUpdate, stashedSuspenseParent, stashedSuspensePrevious, stashedSuspenseRemaining);
                   shouldPopSuspenseNode = false;
-                }
+                } else {}
               } else {
                 if (fiber.child !== null) {
                   mountChildrenRecursively(fiber.child, traceNearestHostComponentUpdate);
@@ -29800,7 +29800,7 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
                   shouldPopSuspenseNode = false;
                 } else if (previousHydrated && !nextHydrated) {
                   throw new Error("Encountered a dehydrated Suspense boundary that was previously hydrated.");
-                }
+                } else {}
               } else {
                 if (nextFiber.child !== prevFiber.child) {
                   updateFlags |= updateChildrenRecursively(nextFiber.child, prevFiber.child, traceNearestHostComponentUpdate);
@@ -29846,8 +29846,8 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
                     recordResetChildren(fiberInstance);
                   }
                   updateFlags &= ~ShouldResetChildren;
-                }
-              }
+                } else {}
+              } else {}
               if ((updateFlags & ShouldResetSuspenseChildren) !== NoUpdate) {
                 if (fiberInstance !== null && fiberInstance.kind === FIBER_INSTANCE) {
                   var _suspenseNode3 = fiberInstance.suspenseNode;
@@ -29855,7 +29855,7 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
                     recordResetSuspenseChildren(_suspenseNode3);
                     updateFlags &= ~ShouldResetSuspenseChildren;
                   }
-                }
+                } else {}
               }
               if ((updateFlags & ShouldResetParentSuspenseChildren) !== NoUpdate) {
                 if (fiberInstance !== null && fiberInstance.kind === FIBER_INSTANCE) {
@@ -29864,7 +29864,7 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
                     updateFlags &= ~ShouldResetParentSuspenseChildren;
                     updateFlags |= ShouldResetSuspenseChildren;
                   }
-                }
+                } else {}
               }
               return updateFlags;
             } finally {
@@ -32928,7 +32928,7 @@ The error thrown in the component is:
               rendererInterface = renderer_attach(hook, id, renderer, global2, shouldStartProfilingNow, profilingSettings);
             } else if (renderer.ComponentTree) {
               rendererInterface = legacy_renderer_attach(hook, id, renderer, global2);
-            }
+            } else {}
           }
           return rendererInterface;
         }
@@ -35811,7 +35811,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
         this._exitCallback = (err) => {
           if (err.code !== "commander.executeSubCommandAsync") {
             throw err;
-          }
+          } else {}
         };
       }
       return this;
@@ -36860,7 +36860,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@hasna/skills",
-    version: "0.1.46",
+    version: "0.1.48",
     description: "Skills library for AI coding agents",
     type: "module",
     bin: {
@@ -36929,7 +36929,7 @@ var init_package = __esm(() => {
       typescript: "^5"
     },
     dependencies: {
-      "@hasna/events": "^0.1.3",
+      "@hasna/events": "^0.1.7",
       "@modelcontextprotocol/sdk": "^1.26.0",
       chalk: "^5.3.0",
       commander: "^12.1.0",
@@ -37848,7 +37848,7 @@ var require_jsx_dev_runtime = __commonJS((exports, module) => {
 });
 
 // src/lib/config.ts
-import { existsSync as existsSync3, readFileSync as readFileSync2, writeFileSync, mkdirSync, copyFileSync } from "fs";
+import { existsSync as existsSync3, readFileSync as readFileSync2, writeFileSync, mkdirSync, copyFileSync, readdirSync, statSync } from "fs";
 import { join as join3, dirname } from "path";
 import { homedir as homedir2 } from "os";
 function validKeys() {
@@ -37859,6 +37859,24 @@ function allowedValues(key) {
     return MODE_VALUES;
   return ENUM_KEYS[key];
 }
+function mergeDirectoryContents(sourceDir, targetDir) {
+  if (!existsSync3(sourceDir))
+    return;
+  mkdirSync(targetDir, { recursive: true });
+  for (const entry of readdirSync(sourceDir)) {
+    const sourcePath = join3(sourceDir, entry);
+    const targetPath = join3(targetDir, entry);
+    try {
+      const sourceStat = statSync(sourcePath);
+      if (sourceStat.isDirectory()) {
+        mergeDirectoryContents(sourcePath, targetPath);
+        continue;
+      }
+      if (!existsSync3(targetPath))
+        copyFileSync(sourcePath, targetPath);
+    } catch {}
+  }
+}
 function normalizeConfigValue(key, value) {
   if (typeof value !== "string")
     return;
@@ -37882,14 +37900,17 @@ function normalizeConfigValue(key, value) {
 function getDataDir() {
   const home = process.env["HOME"] || process.env["USERPROFILE"] || homedir2();
   const newDir = join3(home, ".hasna", "skills");
+  const oldDir = join3(home, ".skills");
   const oldConfigFile = join3(home, ".skillsrc");
+  mkdirSync(newDir, { recursive: true });
+  try {
+    mergeDirectoryContents(oldDir, newDir);
+  } catch {}
   if (existsSync3(oldConfigFile) && !existsSync3(join3(newDir, "config.json"))) {
-    mkdirSync(newDir, { recursive: true });
     try {
       copyFileSync(oldConfigFile, join3(newDir, "config.json"));
     } catch {}
   }
-  mkdirSync(newDir, { recursive: true });
   return newDir;
 }
 function getConfigPath(scope) {
@@ -37993,7 +38014,8 @@ var init_skill_aliases = __esm(() => {
     "pdf-reader": "read-pdf",
     "generate-image": "image",
     "image-generator": "image",
-    "create-blog-article": "blog-article"
+    "create-blog-article": "blog-article",
+    "skill-diff": "diff-viewer"
   };
 });
 
@@ -38410,7 +38432,7 @@ var init_pricing = __esm(() => {
     { slug: "brand-kit", displayName: "Brand Kit", tier: "premium", costCents: 400, providers: ["hosted"], description: "Hosted brand kit with logo usage, palette, typography, brand voice, sample applications, Markdown guide, PDF guide, and SVG assets" },
     { slug: "generate-book-cover", displayName: "Book Cover", tier: "premium", costCents: 20, providers: ["gpt-image-2"], description: "Professional book cover design from title and genre" },
     { slug: "remove-background", displayName: "Remove Background", tier: "premium", costCents: 10, providers: ["gemini-3-pro"], description: "AI-powered background removal from images" },
-    { slug: "transcript", displayName: "Transcript", tier: "premium", costCents: 10, providers: ["whisper"], description: "Audio/video transcription with timestamps" },
+    { slug: "transcript", displayName: "Transcript", tier: "premium", costCents: 10, providers: ["openai", "elevenlabs", "deepgram", "hosted"], description: "Audio/video transcription with timestamps, diarization, and URL support" },
     { slug: "webcrawling", displayName: "Web Crawling", tier: "premium", costCents: 5, providers: ["firecrawl"], description: "Structured web page crawling and extraction" },
     { slug: "browse", displayName: "Browse", tier: "premium", costCents: 5, providers: ["browser"], description: "Web browsing and page interaction" },
     { slug: "read-pdf", displayName: "Read PDF", tier: "premium", costCents: 5, providers: ["cerebras"], description: "Hosted PDF extraction and structured content analysis" },
@@ -38477,7 +38499,7 @@ var init_pricing = __esm(() => {
 });
 
 // src/lib/skill-validation.ts
-import { existsSync as existsSync4, lstatSync, readFileSync as readFileSync3, readdirSync, statSync } from "fs";
+import { existsSync as existsSync4, lstatSync, readFileSync as readFileSync3, readdirSync as readdirSync2, statSync as statSync2 } from "fs";
 import { isAbsolute, join as join4, normalize } from "path";
 function add2(target, code, message) {
   target.push({ code, message });
@@ -38585,7 +38607,7 @@ function validateSkillDirectory(name, skillPath, registryMeta) {
   if (!VALID_BIN_COMMAND.test(bareName)) {
     add2(issues, "skill.name_invalid", `Skill name '${bareName}' must use lowercase letters, numbers, dots, underscores, or hyphens`);
   }
-  for (const entry of readdirSync(skillPath).sort()) {
+  for (const entry of readdirSync2(skillPath).sort()) {
     const entryPath = join4(skillPath, entry);
     if (RESERVED_SKILL_ENTRIES.has(entry)) {
       add2(issues, "skill.reserved_file", `Reserved file '${entry}' is not allowed in skill packages`);
@@ -38700,7 +38722,7 @@ function validateSkillDirectory(name, skillPath, registryMeta) {
             const targetPath = join4(skillPath, target);
             if (!existsSync4(targetPath)) {
               add2(warnings, "package.bin_target_missing", `package.json bin '${command}' target '${target}' is not present before build`);
-            } else if (statSync(targetPath).isDirectory()) {
+            } else if (statSync2(targetPath).isDirectory()) {
               add2(issues, "package.bin_target_directory", `package.json bin '${command}' target '${target}' must point to a file, not a directory`);
             }
           }
@@ -38723,7 +38745,7 @@ function validateSkillDirectory(name, skillPath, registryMeta) {
     add2(issues, "skill.src_index_missing", "Missing src/index.ts or src/index.js");
   } else {
     const indexPath = existsSync4(join4(srcDir, "index.ts")) ? join4(srcDir, "index.ts") : join4(srcDir, "index.js");
-    const size2 = statSync(indexPath).size;
+    const size2 = statSync2(indexPath).size;
     if (size2 < 50)
       add2(warnings, "skill.src_index_minimal", `Source entry point is very small (${size2}B)`);
   }
@@ -38796,9 +38818,9 @@ import {
   lstatSync as lstatSync2,
   mkdirSync as mkdirSync2,
   readFileSync as readFileSync4,
-  readdirSync as readdirSync2,
+  readdirSync as readdirSync3,
   rmSync,
-  statSync as statSync2,
+  statSync as statSync3,
   writeFileSync as writeFileSync2
 } from "fs";
 import { basename, dirname as dirname2, isAbsolute as isAbsolute2, join as join5, normalize as normalize2, relative } from "path";
@@ -38829,7 +38851,7 @@ function findPortableSkill(name, options = {}) {
     return null;
   }
   const path = getPortableSkillPath(normalized, options);
-  if (!existsSync5(path) || !statSync2(path).isDirectory())
+  if (!existsSync5(path) || !statSync3(path).isDirectory())
     return null;
   try {
     return summarizePortableSkill(path, normalized);
@@ -38842,7 +38864,7 @@ function listPortableSkills(options = {}) {
   if (!existsSync5(root))
     return [];
   const skills = [];
-  for (const entry of readdirSync2(root).sort()) {
+  for (const entry of readdirSync3(root).sort()) {
     if (entry.startsWith(".") || DATA_DIR_NON_SKILL_ENTRIES.has(entry))
       continue;
     const path = join5(root, entry);
@@ -38918,7 +38940,7 @@ function scaffoldPortableSkill(name, options = {}) {
 }
 function portPortableSkill(sourcePath, options = {}) {
   const absoluteSource = normalize2(sourcePath);
-  if (!existsSync5(absoluteSource) || !statSync2(absoluteSource).isDirectory()) {
+  if (!existsSync5(absoluteSource) || !statSync3(absoluteSource).isDirectory()) {
     throw new Error(`Skill source directory not found: ${sourcePath}`);
   }
   const inferred = readPortableSkillManifest(absoluteSource, basename(absoluteSource));
@@ -38987,7 +39009,7 @@ function validatePortableSkillDirectory(name, skillPath) {
             const entryPath = join5(skillPath, command.entry);
             if (!existsSync5(entryPath))
               add3(issues, "portable.command_entry_missing", `Command '${command.name}' entry '${command.entry}' is missing`);
-            else if (statSync2(entryPath).isDirectory())
+            else if (statSync3(entryPath).isDirectory())
               add3(issues, "portable.command_entry_directory", `Command '${command.name}' entry '${command.entry}' must be a file`);
           }
         }
@@ -39355,7 +39377,7 @@ function displayName(name) {
 }
 function safeIsDirectory(path) {
   try {
-    return statSync2(path).isDirectory();
+    return statSync3(path).isDirectory();
   } catch {
     return false;
   }
@@ -40616,9 +40638,9 @@ var init_media_processing = __esm(() => {
     {
       name: "transcript",
       displayName: "Transcript",
-      description: "Generate transcripts from audio and video files with timestamps",
+      description: "Transcribe audio, video, and media URLs with OpenAI GPT-4o, ElevenLabs Scribe v2, DeepGram, or hosted runtime",
       category: "Media Processing",
-      tags: ["transcript", "audio", "video", "speech-to-text"]
+      tags: ["transcript", "audio", "video", "speech-to-text", "diarization", "youtube"]
     },
     {
       name: "video-cut-suggester",
@@ -41437,7 +41459,7 @@ __export(exports_registry, {
   CATEGORIES: () => CATEGORIES,
   BASIC_SKILL_NAMES: () => BASIC_SKILL_NAMES
 });
-import { existsSync as existsSync6, readFileSync as readFileSync5, readdirSync as readdirSync3 } from "fs";
+import { existsSync as existsSync6, readFileSync as readFileSync5, readdirSync as readdirSync4 } from "fs";
 import { join as join6 } from "path";
 function isBasicSkillName(name) {
   return BASIC_SKILL_NAMES.includes(name);
@@ -41475,7 +41497,7 @@ function discoverSkillsInDir(dir) {
     return [];
   const result2 = [];
   try {
-    const entries = readdirSync3(dir, { withFileTypes: true });
+    const entries = readdirSync4(dir, { withFileTypes: true });
     for (const entry of entries) {
       if (!entry.isDirectory())
         continue;
@@ -54491,7 +54513,7 @@ function finalize(ctx, schema) {
     result2.$schema = "http://json-schema.org/draft-07/schema#";
   } else if (ctx.target === "draft-04") {
     result2.$schema = "http://json-schema.org/draft-04/schema#";
-  } else if (ctx.target === "openapi-3.0") {}
+  } else if (ctx.target === "openapi-3.0") {} else {}
   if (ctx.external?.uri) {
     const id = ctx.external.registry.get(schema)?.id;
     if (!id)
@@ -54756,7 +54778,7 @@ var formatMap, stringProcessor = (schema, ctx, _json, _params) => {
     if (val === undefined) {
       if (ctx.unrepresentable === "throw") {
         throw new Error("Literal `undefined` cannot be represented in JSON Schema");
-      }
+      } else {}
     } else if (typeof val === "bigint") {
       if (ctx.unrepresentable === "throw") {
         throw new Error("BigInt literals cannot be represented in JSON Schema");
@@ -58086,30 +58108,119 @@ var init_install = __esm(() => {
   init_installer();
 });
 
+// src/lib/compact-output.ts
+function truncateText(value, maxChars = 96) {
+  const text = String(value ?? "").replace(/\s+/g, " ").trim();
+  if (text.length <= maxChars)
+    return text;
+  return `${text.slice(0, Math.max(0, maxChars - 3)).trimEnd()}...`;
+}
+function previewText(value, maxChars = DEFAULT_PREVIEW_CHARS) {
+  const text = String(value ?? "");
+  return {
+    text: text.length > maxChars ? `${text.slice(0, Math.max(0, maxChars - 3))}...` : text,
+    length: text.length,
+    truncated: text.length > maxChars
+  };
+}
+function parsePageLimit(value, fallback, options = {}) {
+  const max2 = options.max ?? MAX_PAGE_LIMIT;
+  if (typeof value === "string" && options.allowAll && value.trim().toLowerCase() === "all") {
+    return Number.POSITIVE_INFINITY;
+  }
+  const parsed = typeof value === "number" ? value : Number.parseInt(value ?? "", 10);
+  if (!Number.isFinite(parsed))
+    return fallback;
+  if (options.allowAll && parsed === 0)
+    return Number.POSITIVE_INFINITY;
+  if (parsed <= 0)
+    return fallback;
+  return Math.min(parsed, max2);
+}
+function parsePageOffset(value, fallback = 0) {
+  const parsed = typeof value === "number" ? value : Number.parseInt(value ?? "", 10);
+  if (!Number.isFinite(parsed) || parsed < 0)
+    return fallback;
+  return parsed;
+}
+function paginate(items, options) {
+  const offset = Math.min(parsePageOffset(options.offset), items.length);
+  const effectiveLimit = Number.isFinite(options.limit) ? Math.max(0, Math.min(options.limit, MAX_PAGE_LIMIT)) : Math.max(0, items.length - offset);
+  const pageItems = items.slice(offset, offset + effectiveLimit);
+  const nextOffset = offset + pageItems.length < items.length ? offset + pageItems.length : null;
+  return {
+    items: pageItems,
+    total: items.length,
+    offset,
+    limit: effectiveLimit,
+    hasMore: nextOffset !== null,
+    nextOffset
+  };
+}
+function showingLabel(total, shown, offset) {
+  if (offset > 0 || shown < total)
+    return `showing ${shown} of ${total}, cursor ${offset}`;
+  return String(total);
+}
+function compactRunRecord(run) {
+  if (!run || typeof run !== "object")
+    return {};
+  return {
+    id: run.id,
+    skill: run.skill,
+    status: run.status,
+    startedAt: run.startedAt,
+    ...run.completedAt ? { completedAt: run.completedAt } : {},
+    ...run.remoteRunId ? { remoteRunId: run.remoteRunId } : {},
+    ...run.costCents !== undefined ? { costCents: run.costCents } : {},
+    ...run.error ? { error: truncateText(run.error, 240) } : {},
+    artifactCount: Array.isArray(run.artifacts) ? run.artifacts.length : 0,
+    paths: run.paths
+  };
+}
+function compactRemoteRun(run) {
+  if (!run || typeof run !== "object")
+    return {};
+  return {
+    ...run.contractVersion !== undefined ? { contractVersion: run.contractVersion } : {},
+    id: run.id,
+    skill: run.skill ?? run.requestedSlug,
+    status: run.status,
+    ...run.correlationId ? { correlationId: run.correlationId } : {},
+    ...run.createdAt ? { createdAt: run.createdAt } : {},
+    ...run.startedAt ? { startedAt: run.startedAt } : {},
+    ...run.completedAt ? { completedAt: run.completedAt } : {},
+    ...run.error || run.errorMessage ? { error: truncateText(run.error ?? run.errorMessage, 240) } : {}
+  };
+}
+var DEFAULT_LIST_LIMIT = 30, DEFAULT_SEARCH_LIMIT = 20, DEFAULT_TAG_LIMIT = 80, DEFAULT_MCP_LIMIT = 25, MAX_PAGE_LIMIT = 200, DEFAULT_PREVIEW_CHARS = 600;
+
 // src/cli/commands/list.ts
 var exports_list = {};
 __export(exports_list, {
   registerBrowse: () => registerBrowse
 });
 function registerBrowse(parent) {
-  parent.command("list").alias("ls").option("-c, --category <category>", "Filter by category").option("-p, --pinned", "Show only pinned skills", false).option("-t, --tags <tags>", "Filter by comma-separated tags (OR logic, case-insensitive)").option("--all", "Show the full skill registry instead of the default basic set", false).option("--remote", "Use remote registry from SKILLS_API_URL or config apiUrl", false).option("--json", "Output as JSON", false).option("--brief", "One line per skill: name \u2014 description [category]", false).option("--format <format>", "Output format: compact (names only) or csv (name,category,price,description)").action((options) => {
+  parent.command("list").alias("ls").option("-c, --category <category>", "Filter by category").option("-p, --pinned", "Show only pinned skills", false).option("-t, --tags <tags>", "Filter by comma-separated tags (OR logic, case-insensitive)").option("--all", "Show the full skill registry instead of the default basic set", false).option("--remote", "Use remote registry from SKILLS_API_URL or config apiUrl", false).option("--json", "Output as JSON", false).option("--brief", "One line per skill: name \u2014 description [category]", false).option("--format <format>", "Output format: compact (names only) or csv (name,category,price,description)").option("--limit <n>", "Maximum rows to print for human output (default: 30, use 0 or all for every row)").option("--cursor <n>", "Numeric offset for human-output pagination", "0").option("--verbose", "Show longer descriptions and tags in human output", false).action((options) => {
     return handleList(options).catch(handleBrowseError);
   });
-  parent.command("search").alias("s").argument("<query>", "Search term").option("--json", "Output as JSON", false).option("--brief", "One line per skill: name \u2014 description [category]", false).option("--format <format>", "Output format: compact (names only) or csv (name,category,price,description)").option("-c, --category <category>", "Filter results by category").option("-t, --tags <tags>", "Filter results by comma-separated tags (OR logic, case-insensitive)").option("--all", "Search the full skill registry instead of the default basic set", false).option("--remote", "Use remote registry from SKILLS_API_URL or config apiUrl", false).description("Search for skills").action((query, options) => {
+  parent.command("search").alias("s").argument("<query>", "Search term").option("--json", "Output as JSON", false).option("--brief", "One line per skill: name \u2014 description [category]", false).option("--format <format>", "Output format: compact (names only) or csv (name,category,price,description)").option("-c, --category <category>", "Filter results by category").option("-t, --tags <tags>", "Filter results by comma-separated tags (OR logic, case-insensitive)").option("--all", "Search the full skill registry instead of the default basic set", false).option("--remote", "Use remote registry from SKILLS_API_URL or config apiUrl", false).option("--limit <n>", "Maximum rows to print for human output (default: 20, use 0 or all for every row)").option("--cursor <n>", "Numeric offset for human-output pagination", "0").option("--verbose", "Show longer descriptions and tags in human output", false).description("Search for skills").action((query, options) => {
     return handleSearch(query, options).catch(handleBrowseError);
   });
   parent.command("categories").option("--json", "Output as JSON", false).option("--remote", "Use remote registry from SKILLS_API_URL or config apiUrl", false).description("List all categories").action((options) => {
     return handleCategories(options).catch(handleBrowseError);
   });
-  parent.command("tags").option("--json", "Output as JSON", false).option("--remote", "Use remote registry from SKILLS_API_URL or config apiUrl", false).description("List all unique tags with counts").action((options) => {
+  parent.command("tags").option("--json", "Output as JSON", false).option("--remote", "Use remote registry from SKILLS_API_URL or config apiUrl", false).option("--limit <n>", "Maximum rows to print for human output (default: 80, use 0 or all for every row)").option("--cursor <n>", "Numeric offset for human-output pagination", "0").description("List all unique tags with counts").action((options) => {
     return handleTags(options).catch(handleBrowseError);
   });
 }
 function formatBrief(skill) {
-  return `${skill.name} \u2014 ${skill.description} (${publicDiscoveryPriceLabel(skill)}) [${skill.category}]`;
+  return `${skill.name} \u2014 ${truncateText(skill.description, 110)} (${publicDiscoveryPriceLabel(skill)}) [${skill.category}]`;
 }
-function formatSkillLine(skill) {
-  return `  ${source_default.cyan(skill.name)}${skill.source === "custom" ? source_default.yellow(" [custom]") : ""} ${source_default.dim(`(${publicDiscoveryPriceLabel(skill)})`)} - ${skill.description}`;
+function formatSkillLine(skill, options = {}) {
+  const description = truncateText(skill.description, options.verbose ? 180 : 88);
+  const tags = options.verbose && skill.tags.length ? source_default.dim(` tags: ${skill.tags.join(", ")}`) : "";
+  return `  ${source_default.cyan(skill.name)}${skill.source === "custom" ? source_default.yellow(" [custom]") : ""} ${source_default.dim(`[${skill.category}]`)} ${source_default.dim(`(${publicDiscoveryPriceLabel(skill)})`)} - ${description}${tags}`;
 }
 function enrichDiscovery(skills) {
   return skills.map(getPublicSkillDiscovery);
@@ -58149,6 +58260,8 @@ async function handleList(options) {
   const fmt = !options.json ? options.format : undefined;
   const profile = options.all ? "all" : "basic";
   const registry2 = await getBrowseRegistry(options);
+  const limit = parsePageLimit(options.limit, DEFAULT_LIST_LIMIT, { allowAll: true });
+  const offset = parsePageOffset(options.cursor);
   if (options.pinned) {
     const installed = getInstalledSkills();
     if (options.json) {
@@ -58172,14 +58285,16 @@ async function handleList(options) {
     }
     const meta3 = getInstallMeta();
     const registry3 = loadRegistry();
+    const page2 = paginate(installed, { limit, offset });
     console.log(source_default.bold(`
-Pinned skills (${installed.length}):
+Pinned skills (${showingLabel(installed.length, page2.items.length, page2.offset)}):
 `));
-    for (const name of installed) {
+    for (const name of page2.items) {
       const m = meta3.skills[name];
       const s = registry3.find((r) => r.name === name);
       console.log(`  ${source_default.cyan(name)}${s?.source === "custom" ? source_default.yellow(" [custom]") : ""}  ${m?.version ? source_default.dim(`v${m.version}`) : ""}  ${m?.installedAt ? source_default.dim(new Date(m.installedAt).toLocaleDateString()) : ""}`);
     }
+    printPageHint(page2, "skills list --pinned");
     return;
   }
   const tagFilter = options.tags ? options.tags.split(",").map((t) => t.trim().toLowerCase()).filter(Boolean) : null;
@@ -58200,16 +58315,19 @@ Available: ${categories.join(", ")}`);
       await writeJson(output, 2);
       return;
     }
+    const page2 = paginate(output, { limit, offset });
     if (brief) {
-      for (const s of output)
+      for (const s of page2.items)
         console.log(formatBrief(s));
+      printPageHint(page2, listCommand(options));
       return;
     }
     console.log(source_default.bold(`
-${category} (${skills.length}):
+${category} (${showingLabel(output.length, page2.items.length, page2.offset)}):
 `));
-    for (const s of output)
-      console.log(formatSkillLine(s));
+    for (const s of page2.items)
+      console.log(formatSkillLine(s, { verbose: options.verbose }));
+    printSkillHint(page2, listCommand(options));
     return;
   }
   if (tagFilter) {
@@ -58219,16 +58337,19 @@ ${category} (${skills.length}):
       await writeJson(output, 2);
       return;
     }
+    const page2 = paginate(output, { limit, offset });
     if (brief) {
-      for (const s of output)
+      for (const s of page2.items)
         console.log(formatBrief(s));
+      printPageHint(page2, listCommand(options));
       return;
     }
     console.log(source_default.bold(`
-Skills matching tags [${tagFilter.join(", ")}] (${skills.length}):
+Skills matching tags [${tagFilter.join(", ")}] (${showingLabel(output.length, page2.items.length, page2.offset)}):
 `));
-    for (const s of output)
-      console.log(`  ${source_default.cyan(s.name)}${s.source === "custom" ? source_default.yellow(" [custom]") : ""} ${source_default.dim(`[${s.category}]`)} ${source_default.dim(`(${publicDiscoveryPriceLabel(s)})`)} - ${s.description}`);
+    for (const s of page2.items)
+      console.log(formatSkillLine(s, { verbose: options.verbose }));
+    printSkillHint(page2, listCommand(options));
     return;
   }
   const allSkills = enrichDiscovery(registry2);
@@ -58250,28 +58371,21 @@ Skills matching tags [${tagFilter.join(", ")}] (${skills.length}):
     return;
   }
   if (brief) {
-    for (const s of [...allSkills].sort((a, b) => a.category.localeCompare(b.category) || a.name.localeCompare(b.name)))
+    const sorted2 = [...allSkills].sort((a, b) => a.category.localeCompare(b.category) || a.name.localeCompare(b.name));
+    const page2 = paginate(sorted2, { limit, offset });
+    for (const s of page2.items)
       console.log(formatBrief(s));
+    printPageHint(page2, listCommand(options));
     return;
   }
+  const sorted = [...allSkills].sort((a, b) => a.category.localeCompare(b.category) || a.name.localeCompare(b.name));
+  const page = paginate(sorted, { limit, offset });
   console.log(source_default.bold(`
-Available ${profile === "basic" ? "default " : ""}skills (${allSkills.length}):
+Available ${profile === "basic" ? "default " : ""}skills (${showingLabel(allSkills.length, page.items.length, page.offset)}):
 `));
-  for (const category of registryCategories(allSkills)) {
-    const skills = allSkills.filter((s) => s.category === category);
-    if (skills.length === 0)
-      continue;
-    console.log(source_default.bold(`${category} (${skills.length}):`));
-    for (const s of skills)
-      console.log(formatSkillLine(s));
-    console.log();
-  }
-  const customUncategorized = allSkills.filter((s) => s.source === "custom" && !CATEGORIES.includes(s.category));
-  if (customUncategorized.length > 0) {
-    console.log(source_default.bold(`Custom (${customUncategorized.length}):`));
-    for (const s of customUncategorized)
-      console.log(`  ${source_default.yellow(s.name)} ${source_default.dim(`(${publicDiscoveryPriceLabel(s)})`)} - ${s.description}`);
-  }
+  for (const s of page.items)
+    console.log(formatSkillLine(s, { verbose: options.verbose }));
+  printSkillHint(page, listCommand(options));
 }
 async function handleSearch(query, options) {
   const registry2 = await getBrowseRegistry(options);
@@ -58318,19 +58432,22 @@ Available: ${categories.join(", ")}`);
     }
     return;
   }
+  const limit = parsePageLimit(options.limit, DEFAULT_SEARCH_LIMIT, { allowAll: true });
+  const offset = parsePageOffset(options.cursor);
+  const page = paginate(output, { limit, offset });
   if (brief) {
-    for (const s of output)
+    for (const s of page.items)
       console.log(formatBrief(s));
+    printPageHint(page, searchCommand(query, options));
     return;
   }
   console.log(source_default.bold(`
-Found ${output.length} skill(s):
+Found ${skillCountLabel(output.length, page.items.length, page.offset)} for "${query}":
 `));
-  for (const s of output) {
-    console.log(`  ${source_default.cyan(s.name)} ${source_default.dim(`[${s.category}]`)}`);
-    console.log(`    ${source_default.dim("Price:")} ${publicDiscoveryPriceLabel(s)}`);
-    console.log(`    ${s.description}`);
+  for (const s of page.items) {
+    console.log(formatSkillLine(s, { verbose: options.verbose }));
   }
+  printSkillHint(page, searchCommand(query, options));
 }
 async function handleCategories(options) {
   const registry2 = await getBrowseRegistry({ all: true, remote: options.remote });
@@ -58359,11 +58476,60 @@ async function handleTags(options) {
     await writeJson(sorted, 2);
     return;
   }
+  const page = paginate(sorted, {
+    limit: parsePageLimit(options.limit, DEFAULT_TAG_LIMIT, { allowAll: true }),
+    offset: parsePageOffset(options.cursor)
+  });
   console.log(source_default.bold(`
-Tags:
+Tags: ${showingLabel(sorted.length, page.items.length, page.offset)}
 `));
-  for (const { name, count } of sorted)
+  for (const { name, count } of page.items)
     console.log(`  ${source_default.cyan(name)} (${count})`);
+  printPageHint(page, `skills tags${options.remote ? " --remote" : ""}`);
+}
+function printSkillHint(page, command) {
+  printPageHint(page, command);
+  console.log(source_default.dim(`Details: skills show <name> or rerun with --verbose. Use --json for the full machine-readable payload.`));
+}
+function printPageHint(page, command) {
+  if (!page.hasMore || page.nextOffset === null)
+    return;
+  console.log(source_default.dim(`
+Next: ${command} --cursor ${page.nextOffset} --limit ${page.limit}`));
+}
+function listCommand(options) {
+  const parts = ["skills list"];
+  if (options.all)
+    parts.push("--all");
+  if (options.remote)
+    parts.push("--remote");
+  if (options.category)
+    parts.push("--category", quoteArg(options.category));
+  if (options.tags)
+    parts.push("--tags", quoteArg(options.tags));
+  if (options.pinned)
+    parts.push("--pinned");
+  return parts.join(" ");
+}
+function searchCommand(query, options) {
+  const parts = ["skills search", quoteArg(query)];
+  if (options.all)
+    parts.push("--all");
+  if (options.remote)
+    parts.push("--remote");
+  if (options.category)
+    parts.push("--category", quoteArg(options.category));
+  if (options.tags)
+    parts.push("--tags", quoteArg(options.tags));
+  return parts.join(" ");
+}
+function quoteArg(value) {
+  return value.includes(" ") ? JSON.stringify(value) : value;
+}
+function skillCountLabel(total, shown, offset) {
+  if (offset > 0 || shown < total)
+    return `${shown} of ${total} skill(s), cursor ${offset}`;
+  return `${total} skill(s)`;
 }
 var init_list = __esm(() => {
   init_source();
@@ -59305,7 +59471,7 @@ var exports_diagnostic = {};
 __export(exports_diagnostic, {
   registerDiagnostic: () => registerDiagnostic
 });
-import { existsSync as existsSync13, readFileSync as readFileSync12, readdirSync as readdirSync4, statSync as statSync3, writeFileSync as writeFileSync6 } from "fs";
+import { existsSync as existsSync13, readFileSync as readFileSync12, readdirSync as readdirSync5, statSync as statSync4, writeFileSync as writeFileSync6 } from "fs";
 import { join as join13 } from "path";
 import { execSync as execSync2 } from "child_process";
 function registerDiagnostic(parent) {
@@ -59511,7 +59677,7 @@ function handleWhoami(options) {
     let skillCount = 0;
     if (exists)
       try {
-        skillCount = readdirSync4(agentSkillsPath).filter((f) => !f.startsWith(".") && statSync3(join13(agentSkillsPath, f)).isDirectory()).length;
+        skillCount = readdirSync5(agentSkillsPath).filter((f) => !f.startsWith(".") && statSync4(join13(agentSkillsPath, f)).isDirectory()).length;
       } catch {}
     agentConfigs.push({ agent, label: AGENT_LABELS[agent], path: agentSkillsPath, exists, skillCount });
   }
@@ -59644,7 +59810,7 @@ var REMOTE_SKILL_RUN_CONTRACT_VERSION = 1;
 
 // src/lib/run-state.ts
 import { createHash, randomBytes } from "crypto";
-import { existsSync as existsSync14, mkdirSync as mkdirSync5, readFileSync as readFileSync13, readdirSync as readdirSync5, statSync as statSync4, writeFileSync as writeFileSync7 } from "fs";
+import { existsSync as existsSync14, mkdirSync as mkdirSync5, readFileSync as readFileSync13, readdirSync as readdirSync6, statSync as statSync5, writeFileSync as writeFileSync7 } from "fs";
 import { extname, join as join14, relative as relative2 } from "path";
 function createSkillRun(params, targetDir = process.cwd()) {
   const now3 = new Date;
@@ -59719,11 +59885,11 @@ function listSkillRuns(targetDir = process.cwd(), limit = 50) {
   if (!existsSync14(runsRoot))
     return [];
   const records = [];
-  for (const day of readdirSync5(runsRoot).sort().reverse()) {
+  for (const day of readdirSync6(runsRoot).sort().reverse()) {
     const dayDir = join14(runsRoot, day);
-    if (!statSync4(dayDir).isDirectory())
+    if (!statSync5(dayDir).isDirectory())
       continue;
-    for (const runId of readdirSync5(dayDir).sort().reverse()) {
+    for (const runId of readdirSync6(dayDir).sort().reverse()) {
       const record2 = readRunRecord(join14(dayDir, runId));
       if (record2)
         records.push(record2);
@@ -59737,7 +59903,7 @@ function findSkillRun(runId, targetDir = process.cwd()) {
   const runsRoot = join14(getProjectStateDir(targetDir), "runs");
   if (!existsSync14(runsRoot))
     return null;
-  for (const day of readdirSync5(runsRoot)) {
+  for (const day of readdirSync6(runsRoot)) {
     const record2 = readRunRecord(join14(runsRoot, day, runId));
     if (record2)
       return record2;
@@ -59760,7 +59926,7 @@ function collectRunArtifacts(context) {
     return [];
   const artifacts = [];
   for (const path of walkFiles(context.exportDir)) {
-    const stat = statSync4(path);
+    const stat = statSync5(path);
     const bytes = readFileSync13(path);
     artifacts.push({
       path: toProjectRelative(context.targetDir, path),
@@ -59783,9 +59949,9 @@ function readRunRecord(runDir) {
 }
 function walkFiles(dir) {
   const files = [];
-  for (const entry of readdirSync5(dir)) {
+  for (const entry of readdirSync6(dir)) {
     const full = join14(dir, entry);
-    if (statSync4(full).isDirectory())
+    if (statSync5(full).isDirectory())
       files.push(...walkFiles(full));
     else
       files.push(full);
@@ -75177,18 +75343,29 @@ var init_mcp_contracts = __esm(() => {
     exitCode: { type: "number", description: "Process exit code for local runs." },
     skill: stringSchema("Canonical skill slug."),
     remote: { type: "boolean", description: "Whether the skill was submitted to the hosted runtime." },
-    stdout: stringSchema("Captured stdout for local runs."),
-    stderr: stringSchema("Captured stderr for local runs."),
+    stdoutPreview: objectSchema({
+      text: stringSchema("Truncated stdout preview."),
+      length: { type: "number" },
+      truncated: { type: "boolean" }
+    }, [], "Default compact stdout preview."),
+    stderrPreview: objectSchema({
+      text: stringSchema("Truncated stderr preview."),
+      length: { type: "number" },
+      truncated: { type: "boolean" }
+    }, [], "Default compact stderr preview."),
+    stdout: stringSchema("Captured stdout for local runs when detail:true is requested."),
+    stderr: stringSchema("Captured stderr for local runs when detail:true is requested."),
     id: stringSchema("Remote run id when submitted remotely."),
     localRunId: stringSchema("Local run metadata id."),
     status: stringSchema("Run lifecycle status."),
     pricing: pricingSchema,
-    remoteRun: objectSchema({}, [], "Normalized hosted remote run contract.", true),
-    run: objectSchema({}, [], "Local run metadata.", true),
+    remoteRun: objectSchema({}, [], "Compact hosted remote run summary by default; full contract when detail:true is requested.", true),
+    run: objectSchema({}, [], "Compact local run metadata by default; full metadata when detail:true is requested.", true),
     nextActions: objectSchema({
       poll: stringSchema("Command to poll run status."),
       download: stringSchema("Command to download artifacts.")
-    })
+    }),
+    detailHint: stringSchema("How to request the complete payload.")
   }, [], "Skill run result.");
   toolContracts = [
     {
@@ -75236,7 +75413,7 @@ var init_mcp_contracts = __esm(() => {
     {
       name: "list_skills",
       title: "List Skills",
-      description: "List skills from the basic or full registry profile.",
+      description: "List skills from the basic or full registry profile. Returns a compact paged envelope by default.",
       params: ["category?", "profile?", "detail?", "limit?", "offset?"],
       category: "discovery",
       sideEffects: "none",
@@ -75252,7 +75429,11 @@ var init_mcp_contracts = __esm(() => {
         skills: arraySchema(skillSummarySchema),
         total: { type: "number" },
         offset: { type: "number" },
-        limit: { type: "number" }
+        limit: { type: "number" },
+        nextOffset: { type: "number" },
+        hasMore: { type: "boolean" },
+        nextArguments: objectSchema({}, [], "Arguments for the next page.", true),
+        detailHint: stringSchema("How to request fuller skill objects.")
       })
     },
     {
@@ -75273,7 +75454,7 @@ var init_mcp_contracts = __esm(() => {
     {
       name: "search_skills",
       title: "Search Skills",
-      description: "Search skills by name, description, or tags.",
+      description: "Search skills by name, description, or tags. Returns a compact paged envelope by default.",
       params: ["query", "profile?", "detail?", "limit?", "offset?"],
       category: "discovery",
       sideEffects: "none",
@@ -75285,7 +75466,16 @@ var init_mcp_contracts = __esm(() => {
         limit: { type: "number", minimum: 0 },
         offset: { type: "number", minimum: 0 }
       }, ["query"]),
-      outputSchema: objectSchema({ skills: arraySchema(skillSummarySchema) })
+      outputSchema: objectSchema({
+        skills: arraySchema(skillSummarySchema),
+        total: { type: "number" },
+        offset: { type: "number" },
+        limit: { type: "number" },
+        nextOffset: { type: "number" },
+        hasMore: { type: "boolean" },
+        nextArguments: objectSchema({}, [], "Arguments for the next page.", true),
+        detailHint: stringSchema("How to request fuller skill objects.")
+      })
     },
     {
       name: "get_skill_info",
@@ -75402,8 +75592,8 @@ var init_mcp_contracts = __esm(() => {
     {
       name: "run_skill",
       title: "Run Skill",
-      description: "Run a skill locally or through a configured remote runner.",
-      params: ["name", "input?", "args?", "approved?"],
+      description: "Run a skill locally or through a configured remote runner. Returns compact stdout/stderr previews and run summaries by default; pass detail:true for full records.",
+      params: ["name", "input?", "args?", "approved?", "detail?"],
       category: "execution",
       sideEffects: "local-process-or-remote-run",
       stable: true,
@@ -75411,28 +75601,33 @@ var init_mcp_contracts = __esm(() => {
         name: skillNameInput,
         input: runInputSchema,
         args: runArgsSchema,
-        approved: paidRunApprovalSchema
+        approved: paidRunApprovalSchema,
+        detail: { type: "boolean", default: false, description: "Return full stdout/stderr, remote run, and local run metadata." }
       }, ["name"]),
       outputSchema: runOutputSchema
     },
     {
       name: "get_run_status",
       title: "Get Run Status",
-      description: "Fetch remote run status and next actions.",
-      params: ["run_id"],
+      description: "Fetch remote run status and next actions. Returns a compact status summary by default; pass detail:true for the complete remote run payload.",
+      params: ["run_id", "detail?"],
       category: "execution",
       sideEffects: "none",
       stable: true,
-      inputSchema: objectSchema({ run_id: stringSchema("Remote or local run id.") }, ["run_id"]),
+      inputSchema: objectSchema({
+        run_id: stringSchema("Remote or local run id."),
+        detail: { type: "boolean", default: false, description: "Return the complete remote run payload." }
+      }, ["run_id"]),
       outputSchema: objectSchema({
         contractVersion: { type: "number", description: "Remote run payload contract version." },
         runId: stringSchema("Remote run id."),
         localRunId: stringSchema("Local run id."),
-        run: objectSchema({}, [], "Normalized remote run status.", true),
+        run: objectSchema({}, [], "Compact remote run status by default; full status when detail:true is requested.", true),
         nextActions: objectSchema({
           poll: stringSchema("Command to poll run status."),
           download: stringSchema("Command to download artifacts.")
-        })
+        }),
+        detailHint: stringSchema("How to request the complete payload.")
       })
     },
     {
@@ -75527,13 +75722,25 @@ var init_mcp_contracts = __esm(() => {
     {
       name: "list_schedules",
       title: "List Schedules",
-      description: "List scheduled skill runs.",
-      params: [],
+      description: "List scheduled skill runs as a compact paged envelope.",
+      params: ["limit?", "offset?"],
       category: "scheduling",
       sideEffects: "none",
       stable: true,
-      inputSchema: objectSchema(),
-      outputSchema: arraySchema(objectSchema({}, [], "Schedule record.", true))
+      inputSchema: objectSchema({
+        limit: { type: "number", minimum: 0 },
+        offset: { type: "number", minimum: 0 }
+      }),
+      outputSchema: objectSchema({
+        schedules: arraySchema(objectSchema({}, [], "Compact schedule record.", true)),
+        total: { type: "number" },
+        offset: { type: "number" },
+        limit: { type: "number" },
+        nextOffset: { type: "number" },
+        hasMore: { type: "boolean" },
+        nextArguments: objectSchema({}, [], "Arguments for the next page.", true),
+        detailHint: stringSchema("How to request complete schedule details.")
+      })
     },
     {
       name: "remove_schedule",
@@ -75745,7 +75952,7 @@ var init_helpers = __esm(() => {
 function registerDiscoveryTools(server) {
   server.registerTool("list_skills", {
     title: "List Skills",
-    description: "List skills with public pricing. Defaults to the clean basic profile to avoid context overflow. Set profile:'all' for the full registry. Returns {name,category,pricing} by default; detail:true for full public objects. Supports limit/offset pagination.",
+    description: "List skills with public pricing. Defaults to a compact paged response from the basic profile to avoid context overflow. Set profile:'all' for the full registry, detail:true for full public objects, and use limit/offset to page.",
     inputSchema: {
       category: exports_external.string().optional(),
       profile: exports_external.enum(["basic", "all"]).optional(),
@@ -75757,16 +75964,20 @@ function registerDiscoveryTools(server) {
     const selectedProfile = profile || "basic";
     const skills = category ? loadRegistryProfile(selectedProfile).filter((s) => s.category === category) : loadRegistryProfile(selectedProfile);
     const mapped = detail ? skills.map(getPublicSkillDiscovery) : skills.map(getCompactSkillDiscovery);
-    if (limit !== undefined || offset !== undefined) {
-      const start = offset || 0;
-      const sliced = limit !== undefined ? mapped.slice(start, start + limit) : mapped.slice(start);
-      return {
-        content: [{ type: "text", text: JSON.stringify({ skills: sliced, total: mapped.length, offset: start, limit: limit ?? null }) }]
-      };
-    }
-    return {
-      content: [{ type: "text", text: JSON.stringify(mapped) }]
-    };
+    const page = paginate(mapped, {
+      limit: parsePageLimit(limit, DEFAULT_MCP_LIMIT, { max: 100 }),
+      offset: parsePageOffset(offset)
+    });
+    return mcpJson({
+      skills: page.items,
+      total: page.total,
+      offset: page.offset,
+      limit: page.limit,
+      nextOffset: page.nextOffset,
+      hasMore: page.hasMore,
+      nextArguments: page.hasMore ? { profile: selectedProfile, category, detail: Boolean(detail), limit: page.limit, offset: page.nextOffset } : null,
+      detailHint: detail ? undefined : "Set detail:true for full public skill objects, or call get_skill_info for one skill."
+    });
   });
   server.registerTool("list_pinned_skills", {
     title: "List Pinned Skills",
@@ -75783,7 +75994,7 @@ function registerDiscoveryTools(server) {
   });
   server.registerTool("search_skills", {
     title: "Search Skills",
-    description: "Search skills by name, description, or tags. Defaults to the clean basic profile; set profile:'all' for the full registry. Returns compact list with pricing by default. Supports limit/offset pagination.",
+    description: "Search skills by name, description, or tags. Defaults to a compact paged response from the basic profile; set profile:'all' for the full registry and detail:true for full public objects.",
     inputSchema: {
       query: exports_external.string(),
       profile: exports_external.enum(["basic", "all"]).optional(),
@@ -75799,16 +76010,20 @@ function registerDiscoveryTools(server) {
     if (!cached2)
       cacheSet(cacheKey, results);
     const out = detail ? results.map(getPublicSkillDiscovery) : results.map(getCompactSkillDiscovery);
-    if (limit !== undefined || offset !== undefined) {
-      const start = offset || 0;
-      const sliced = limit !== undefined ? out.slice(start, start + limit) : out.slice(start);
-      return {
-        content: [{ type: "text", text: JSON.stringify({ skills: sliced, total: out.length, offset: start, limit: limit ?? null }) }]
-      };
-    }
-    return {
-      content: [{ type: "text", text: JSON.stringify(out) }]
-    };
+    const page = paginate(out, {
+      limit: parsePageLimit(limit, DEFAULT_MCP_LIMIT, { max: 100 }),
+      offset: parsePageOffset(offset)
+    });
+    return mcpJson({
+      skills: page.items,
+      total: page.total,
+      offset: page.offset,
+      limit: page.limit,
+      nextOffset: page.nextOffset,
+      hasMore: page.hasMore,
+      nextArguments: page.hasMore ? { query, profile: selectedProfile, detail: Boolean(detail), limit: page.limit, offset: page.nextOffset } : null,
+      detailHint: detail ? undefined : "Set detail:true for full public skill objects, or call get_skill_info for one skill."
+    });
   });
   server.registerTool("get_skill_info", {
     title: "Get Skill Info",
@@ -75953,7 +76168,7 @@ var init_remote_client = __esm(() => {
 });
 
 // src/mcp/operation-tools.ts
-import { existsSync as existsSync15, readdirSync as readdirSync6, statSync as statSync5 } from "fs";
+import { existsSync as existsSync15, readdirSync as readdirSync7, statSync as statSync6 } from "fs";
 import { join as join15 } from "path";
 function registerOperationTools(server) {
   server.registerTool("scaffold_skill", {
@@ -76181,9 +76396,10 @@ function registerOperationTools(server) {
       name: exports_external.string(),
       input: exports_external.record(exports_external.string(), exports_external.unknown()).optional(),
       args: exports_external.array(exports_external.string()).optional(),
-      approved: exports_external.boolean().optional()
+      approved: exports_external.boolean().optional(),
+      detail: exports_external.boolean().optional()
     }
-  }, async ({ name, input, args, approved }) => {
+  }, async ({ name, input, args, approved, detail }) => {
     const skill = getSkill(name);
     if (!skill) {
       return mcpError("SKILL_NOT_FOUND", `Skill '${name}' not found`, findSimilarSkills(name));
@@ -76249,7 +76465,7 @@ function registerOperationTools(server) {
         });
         writeRunLogs(runContext, "", "");
         const remoteRunId = typeof run.id === "string" ? run.id : undefined;
-        return mcpJson({
+        const payload2 = {
           contractVersion: REMOTE_SKILL_RUN_CONTRACT_VERSION,
           id: run.id,
           localRunId: localRun2.id,
@@ -76260,7 +76476,8 @@ function registerOperationTools(server) {
           remoteRun: run,
           run: localRun2,
           nextActions: remoteRunNextActions(remoteRunId)
-        });
+        };
+        return mcpJson(detail ? payload2 : compactRunToolPayload(payload2, "Call run_skill again with detail:true for full remote/local run records."));
       } catch (err) {
         const error48 = `Hosted skill ${skillName} requires hosted access: ${err.message}`;
         writeRunLogs(runContext, "", error48 + `
@@ -76282,23 +76499,23 @@ function registerOperationTools(server) {
       status: result2.exitCode === 0 ? "completed" : "failed",
       error: result2.error
     });
+    const payload = { exitCode: result2.exitCode, skill: skillName, stdout: result2.stdout, stderr: result2.stderr, run: localRun };
     if (result2.error) {
       return {
-        content: [{ type: "text", text: JSON.stringify({ exitCode: result2.exitCode, error: result2.error, run: localRun }, null, 2) }],
+        content: [{ type: "text", text: JSON.stringify(detail ? { ...payload, error: result2.error } : compactRunToolPayload({ ...payload, error: result2.error }, "Call run_skill again with detail:true for full stdout/stderr and run metadata.")) }],
         isError: true
       };
     }
-    return {
-      content: [{ type: "text", text: JSON.stringify({ exitCode: result2.exitCode, skill: skillName, stdout: result2.stdout, stderr: result2.stderr, run: localRun }, null, 2) }]
-    };
+    return mcpJson(detail ? payload : compactRunToolPayload(payload, "Call run_skill again with detail:true for full stdout/stderr and run metadata."));
   });
   server.registerTool("get_run_status", {
     title: "Get Run Status",
     description: "Fetch remote run status. Accepts a remote run id or a local run id linked to a remote run.",
     inputSchema: {
-      run_id: exports_external.string()
+      run_id: exports_external.string(),
+      detail: exports_external.boolean().optional()
     }
-  }, async ({ run_id }) => {
+  }, async ({ run_id, detail }) => {
     const { getApiKey: getApiKey2 } = await Promise.resolve().then(() => (init_auth_store(), exports_auth_store));
     const apiKey = getApiKey2();
     if (!apiKey) {
@@ -76315,12 +76532,20 @@ function registerOperationTools(server) {
       const run = await client.getRun(remoteRunId);
       if (!run)
         return mcpError("RUN_NOT_FOUND", `Remote run '${remoteRunId}' not found`);
-      return mcpJson({
+      const payload = {
         contractVersion: REMOTE_SKILL_RUN_CONTRACT_VERSION,
         runId: remoteRunId,
         ...localRun ? { localRunId: localRun.id } : {},
         run,
         nextActions: remoteRunNextActions(remoteRunId)
+      };
+      return mcpJson(detail ? payload : {
+        contractVersion: payload.contractVersion,
+        runId: payload.runId,
+        ...localRun ? { localRunId: localRun.id } : {},
+        run: compactRemoteRun(run),
+        nextActions: payload.nextActions,
+        detailHint: "Call get_run_status with detail:true for the complete remote run payload."
       });
     } catch (err) {
       return mcpError("SKILLS_MD_ERROR", err.message);
@@ -76392,9 +76617,9 @@ function registerOperationTools(server) {
       let skillCount = 0;
       if (exists) {
         try {
-          skillCount = readdirSync6(agentSkillsPath).filter((f) => {
+          skillCount = readdirSync7(agentSkillsPath).filter((f) => {
             const full = join15(agentSkillsPath, f);
-            return !f.startsWith(".") && statSync5(full).isDirectory();
+            return !f.startsWith(".") && statSync6(full).isDirectory();
           }).length;
         } catch {}
       }
@@ -76412,6 +76637,32 @@ function registerOperationTools(server) {
     return { content: [{ type: "text", text: JSON.stringify(result2, null, 2) }] };
   });
 }
+function compactRunToolPayload(payload, detailHint) {
+  const stdout = previewText(payload.stdout ?? "");
+  const stderr = previewText(payload.stderr ?? "");
+  return {
+    ...payload.contractVersion !== undefined ? { contractVersion: payload.contractVersion } : {},
+    ...payload.id !== undefined ? { id: payload.id } : {},
+    ...payload.localRunId !== undefined ? { localRunId: payload.localRunId } : {},
+    ...payload.exitCode !== undefined ? { exitCode: payload.exitCode } : {},
+    skill: payload.skill,
+    ...payload.status !== undefined ? { status: payload.status } : {},
+    ...payload.remote !== undefined ? { remote: payload.remote } : {},
+    ...payload.correlationId !== undefined ? { correlationId: payload.correlationId } : {},
+    ...payload.pricing !== undefined ? { pricing: payload.pricing } : {},
+    ...payload.error !== undefined ? { error: payload.error } : {},
+    ...payload.remoteRun !== undefined ? { remoteRun: compactRemoteRun(payload.remoteRun) } : {},
+    run: compactRunRecord(payload.run),
+    stdoutPreview: stdout,
+    stderrPreview: stderr,
+    stdoutChars: stdout.length,
+    stderrChars: stderr.length,
+    stdoutTruncated: stdout.truncated,
+    stderrTruncated: stderr.truncated,
+    ...payload.nextActions !== undefined ? { nextActions: payload.nextActions } : {},
+    detailHint
+  };
+}
 var init_operation_tools = __esm(() => {
   init_zod();
   init_package();
@@ -76820,11 +77071,37 @@ function registerScheduleTools(server) {
   });
   server.registerTool("list_schedules", {
     title: "List Schedules",
-    description: "List all scheduled skill runs.",
-    inputSchema: {}
-  }, async () => {
+    description: "List scheduled skill runs as a compact paged response. Use limit/offset for pagination.",
+    inputSchema: {
+      limit: exports_external.number().optional(),
+      offset: exports_external.number().optional()
+    }
+  }, async ({ limit, offset }) => {
     const schedules = listSchedules();
-    return { content: [{ type: "text", text: JSON.stringify(schedules, null, 2) }] };
+    const page = paginate(schedules, {
+      limit: parsePageLimit(limit, DEFAULT_MCP_LIMIT, { max: 100 }),
+      offset: parsePageOffset(offset)
+    });
+    return mcpJson({
+      schedules: page.items.map((schedule) => ({
+        id: schedule.id,
+        name: schedule.name,
+        skill: schedule.skill,
+        cron: schedule.cron,
+        enabled: schedule.enabled,
+        lastRun: schedule.lastRun,
+        lastRunStatus: schedule.lastRunStatus,
+        nextRun: schedule.nextRun,
+        argCount: schedule.args?.length ?? 0
+      })),
+      total: page.total,
+      offset: page.offset,
+      limit: page.limit,
+      nextOffset: page.nextOffset,
+      hasMore: page.hasMore,
+      nextArguments: page.hasMore ? { limit: page.limit, offset: page.nextOffset } : null,
+      detailHint: "Use schedule state files or future schedule detail commands for complete schedule records."
+    });
   });
   server.registerTool("remove_schedule", {
     title: "Remove Schedule",
@@ -76880,6 +77157,7 @@ var init_schedule_tools = __esm(() => {
   init_portable_skills();
   init_scheduler();
   init_skill_validation();
+  init_helpers();
 });
 
 // src/lib/native-storage.ts
@@ -76888,8 +77166,8 @@ import {
   existsSync as existsSync18,
   mkdirSync as mkdirSync8,
   readFileSync as readFileSync15,
-  readdirSync as readdirSync7,
-  statSync as statSync6,
+  readdirSync as readdirSync8,
+  statSync as statSync7,
   writeFileSync as writeFileSync9
 } from "fs";
 import { dirname as dirname5, join as join18, normalize as normalize3, relative as relative3, sep } from "path";
@@ -77024,9 +77302,9 @@ function parsePositiveInteger(value) {
 }
 function walkFiles2(dir) {
   const files = [];
-  for (const entry of readdirSync7(dir)) {
+  for (const entry of readdirSync8(dir)) {
     const full = join18(dir, entry);
-    const stats = statSync6(full);
+    const stats = statSync7(full);
     if (stats.isDirectory())
       files.push(...walkFiles2(full));
     else
@@ -77662,7 +77940,7 @@ function registerRuntime(parent) {
   parent.command("quote").argument("<skill>", "Skill name").argument("[args...]", "Arguments that affect pricing, such as --count 8").allowUnknownOption(true).passThroughOptions(true).option("--json", "Output quote as JSON", false).description("Quote a skill run before spending account balance").action((name, args2, options) => handleQuote(name, args2, options));
   parent.command("run").argument("<skill>", "Skill name").argument("[args...]", "Arguments to pass to the skill").allowUnknownOption(true).passThroughOptions(true).option("--json", "Output result as JSON", false).option("-y, --yes", "Approve paid hosted execution without an interactive prompt", false).option("--wait", "Poll remote runs until a terminal status", false).option("--poll-interval-ms <ms>", "Remote polling interval in milliseconds", "1000").option("--poll-timeout-ms <ms>", "Maximum time to wait for a remote run", "300000").description("Run a skill directly").action(async (name, args2, options) => handleRun(name, args2, options));
   const runs = parent.command("runs").description("Inspect local skill run records");
-  runs.command("list").option("--json", "Output as JSON", false).option("--limit <n>", "Maximum number of runs", "20").description("List recent skill runs").action((options) => handleRunsList(options));
+  runs.command("list").option("--json", "Output as JSON", false).option("--limit <n>", "Maximum number of runs", "20").option("--cursor <n>", "Numeric offset for human-output pagination", "0").description("List recent skill runs").action((options) => handleRunsList(options));
   runs.command("show").argument("<run-id>", "Run id").option("--json", "Output as JSON", false).description("Show a skill run record").action((runId, options) => handleRunsShow(runId, options));
   runs.command("status").argument("<run-id>", "Remote run id, or local run id linked to a remote run").option("--json", "Output as JSON", false).description("Fetch remote run status").action((runId, options) => handleRunsStatus(runId, options));
   const exportsCommand = parent.command("exports").description("Inspect or open skill run exports");
@@ -78021,22 +78299,32 @@ function writeBlogArticleValidationError(errors4, json2) {
   process.exitCode = 1;
 }
 function handleRunsList(options) {
-  const limit = Number.parseInt(options.limit, 10);
-  const runs = listSkillRuns(process.cwd(), Number.isFinite(limit) ? limit : 20);
   if (options.json) {
-    console.log(JSON.stringify(runs, null, 2));
+    const jsonLimit = Number.parseInt(options.limit, 10);
+    const runs2 = listSkillRuns(process.cwd(), Number.isFinite(jsonLimit) ? jsonLimit : 20);
+    console.log(JSON.stringify(runs2, null, 2));
     return;
   }
+  const limit = parsePageLimit(options.limit, DEFAULT_LIST_LIMIT, { allowAll: true });
+  const offset = parsePageOffset(options.cursor);
+  const fetchLimit = Number.isFinite(limit) ? limit + offset + 1 : Number.POSITIVE_INFINITY;
+  const runs = listSkillRuns(process.cwd(), Number.isFinite(fetchLimit) ? fetchLimit : 1e4);
   if (!runs.length) {
     console.log(source_default.dim("No skill runs found"));
     return;
   }
+  const hasMoreThanFetched = Number.isFinite(limit) && runs.length > offset + limit;
+  const page = paginate(hasMoreThanFetched ? runs.slice(0, offset + limit) : runs, { limit, offset });
   console.log(source_default.bold(`
-Recent skill runs (${runs.length}):
+Recent skill runs (${showingLabel(hasMoreThanFetched ? offset + limit + 1 : runs.length, page.items.length, page.offset)}):
 `));
-  for (const run of runs) {
-    console.log(`  ${source_default.cyan(run.id)}  ${run.skill}  ${statusColor(run.status)}  ${source_default.dim(run.startedAt)}`);
+  for (const run of page.items) {
+    console.log(`  ${source_default.cyan(run.id)}  ${run.skill}  ${statusColor(run.status)}  ${source_default.dim(run.startedAt)}  artifacts:${run.artifacts.length}`);
   }
+  if (hasMoreThanFetched)
+    console.log(source_default.dim(`
+Next: skills runs list --cursor ${offset + page.items.length} --limit ${page.limit}`));
+  console.log(source_default.dim("Details: skills runs show <run-id> or use --json for full run records."));
 }
 function handleRunsShow(runId, options) {
   const run = findSkillRun(runId);
@@ -78828,7 +79116,7 @@ function registerSchedule(parent) {
       console.log(source_default.dim(`  Next run: ${new Date(schedule.nextRun).toLocaleString()}`));
     console.log(source_default.dim(`  ID: ${schedule.id}`));
   });
-  scheduleCmd.command("list").option("--json", "Output as JSON", false).description("List all scheduled skills").action((options) => {
+  scheduleCmd.command("list").option("--json", "Output as JSON", false).option("--limit <n>", "Maximum rows to print for human output (default: 30, use 0 or all for every row)").option("--cursor <n>", "Numeric offset for human-output pagination", "0").description("List all scheduled skills").action((options) => {
     const schedules = listSchedules();
     if (options.json) {
       console.log(JSON.stringify(schedules));
@@ -78838,15 +79126,25 @@ function registerSchedule(parent) {
       console.log(source_default.dim("No schedules. Run: skills schedule add <skill> <cron>"));
       return;
     }
+    const page = paginate(schedules, {
+      limit: parsePageLimit(options.limit, DEFAULT_LIST_LIMIT, { allowAll: true }),
+      offset: parsePageOffset(options.cursor)
+    });
     console.log(source_default.bold(`
-Scheduled skills (${schedules.length}):
+Scheduled skills (${showingLabel(schedules.length, page.items.length, page.offset)}):
 `));
-    for (const s of schedules) {
+    for (const s of page.items) {
       console.log(`  ${source_default.cyan(s.name)} [${s.enabled ? source_default.green("enabled") : source_default.dim("disabled")}]`);
       const last2 = s.lastRun ? `last: ${new Date(s.lastRun).toLocaleString()} [${s.lastRunStatus ?? "?"}]` : "never run";
       const next = s.nextRun ? `next: ${new Date(s.nextRun).toLocaleString()}` : "";
-      console.log(source_default.dim(`    skill: ${s.skill}  cron: ${s.cron}  ${last2}  ${next}`));
+      const args2 = s.args?.length ? `  args: ${truncateText(s.args.join(" "), 80)}` : "";
+      console.log(source_default.dim(`    ${s.id}  skill: ${s.skill}  cron: ${s.cron}  ${last2}  ${next}${args2}`));
     }
+    if (page.hasMore && page.nextOffset !== null) {
+      console.log(source_default.dim(`
+Next: skills schedule list --cursor ${page.nextOffset} --limit ${page.limit}`));
+    }
+    console.log(source_default.dim("Details: use --json for complete schedule records."));
   });
   scheduleCmd.command("remove").argument("<id-or-name>", "Schedule ID or name to remove").option("--json", "Output as JSON", false).description("Remove a schedule").action((idOrName, options) => {
     const removed = removeSchedule(idOrName);
@@ -85315,9 +85613,15 @@ function print(value, json, text) {
   else
     console.log(text);
 }
+function hasJsonOption(options) {
+  return Boolean(options?.json || options?.opts?.().json || options?.optsWithGlobals?.().json || options?.parent?.opts?.().json || options?.parent?.optsWithGlobals?.().json);
+}
+function wantsJson(actionOptions, command) {
+  return hasJsonOption(actionOptions) || hasJsonOption(command);
+}
 function registerWebhookCommands(program2, options) {
   const webhooks = program2.command(options.webhooksCommandName ?? "webhooks").description("Manage Hasna event webhook subscriptions");
-  webhooks.command("add").description("Add or replace a webhook or command subscription").argument("<target>", "Webhook URL or command binary").requiredOption("--id <id>", "Subscription/channel identifier").option("--transport <kind>", "Transport kind: webhook or command", "webhook").option("--name <name>", "Display name").option("--type <pattern>", "Event type filter, e.g. todos.task.*").option("--source <pattern>", "Event source filter").option("--subject <pattern>", "Event subject filter").option("--severity <pattern>", "Event severity filter").option("--secret <secret>", "Webhook HMAC secret").option("--header <name=value...>", "Webhook header", collectValues, []).option("--arg <arg...>", "Command argument", collectValues, []).option("--timeout-ms <ms>", "Transport timeout in milliseconds", parseNumber).option("--retry-attempts <n>", "Maximum delivery attempts", parseNumber).option("--retry-backoff-ms <ms>", "Initial retry backoff in milliseconds", parseNumber).option("--redact <path...>", "Event field path to redact before delivery", collectValues, []).option("--disabled", "Create channel disabled", false).option("-j, --json", "Print JSON output", false).action(async (target, actionOptions) => {
+  webhooks.command("add").description("Add or replace a webhook or command subscription").argument("<target>", "Webhook URL or command binary").requiredOption("--id <id>", "Subscription/channel identifier").option("--transport <kind>", "Transport kind: webhook or command", "webhook").option("--name <name>", "Display name").option("--type <pattern>", "Event type filter, e.g. todos.task.*").option("--source <pattern>", "Event source filter").option("--subject <pattern>", "Event subject filter").option("--severity <pattern>", "Event severity filter").option("--secret <secret>", "Webhook HMAC secret").option("--header <name=value...>", "Webhook header", collectValues, []).option("--arg <arg...>", "Command argument", collectValues, []).option("--timeout-ms <ms>", "Transport timeout in milliseconds", parseNumber).option("--retry-attempts <n>", "Maximum delivery attempts", parseNumber).option("--retry-backoff-ms <ms>", "Initial retry backoff in milliseconds", parseNumber).option("--redact <path...>", "Event field path to redact before delivery", collectValues, []).option("--disabled", "Create channel disabled", false).option("-j, --json", "Print JSON output", false).action(async (target, actionOptions, command) => {
     const timestamp = new Date().toISOString();
     const channel = {
       id: actionOptions.id,
@@ -85338,11 +85642,11 @@ function registerWebhookCommands(program2, options) {
       throw new Error(`Transport ${actionOptions.transport} is reserved for future use and cannot be added yet`);
     }
     const saved = await createClient(options).addChannel(channel);
-    print(sanitizeChannelForOutput(saved), Boolean(actionOptions.json), `Added ${saved.transport} channel ${saved.id}`);
+    print(sanitizeChannelForOutput(saved), wantsJson(actionOptions, command), `Added ${saved.transport} channel ${saved.id}`);
   });
-  webhooks.command("list").description("List configured subscriptions").option("-j, --json", "Print JSON output", false).action(async (actionOptions) => {
+  webhooks.command("list").description("List configured subscriptions").option("-j, --json", "Print JSON output", false).action(async (actionOptions, command) => {
     const channels = await createClient(options).listChannels();
-    if (actionOptions.json) {
+    if (wantsJson(actionOptions, command)) {
       console.log(JSON.stringify(sanitizeChannelsForOutput(channels), null, 2));
       return;
     }
@@ -85354,11 +85658,11 @@ function registerWebhookCommands(program2, options) {
       console.log(`${channel.id}	${channel.enabled ? "enabled" : "disabled"}	${channel.transport}	${channel.webhook?.url ?? channel.command?.command ?? channel.transport}`);
     }
   });
-  webhooks.command("remove").description("Remove a subscription").argument("<id>", "Subscription/channel identifier").option("-j, --json", "Print JSON output", false).action(async (id, actionOptions) => {
+  webhooks.command("remove").description("Remove a subscription").argument("<id>", "Subscription/channel identifier").option("-j, --json", "Print JSON output", false).action(async (id, actionOptions, command) => {
     const removed = await createClient(options).removeChannel(id);
-    print({ removed }, Boolean(actionOptions.json), removed ? `Removed ${id}` : `Channel not found: ${id}`);
+    print({ removed }, wantsJson(actionOptions, command), removed ? `Removed ${id}` : `Channel not found: ${id}`);
   });
-  webhooks.command("test").description("Send a test event to one subscription").argument("<id>", "Subscription/channel identifier").option("--type <type>", "Event type", "events.test").option("--subject <subject>", "Event subject").option("--message <message>", "Event message", "Hasna events test delivery").option("--data <json>", "Event data JSON object").option("-j, --json", "Print JSON output", false).action(async (id, actionOptions) => {
+  webhooks.command("test").description("Send a test event to one subscription").argument("<id>", "Subscription/channel identifier").option("--type <type>", "Event type", "events.test").option("--subject <subject>", "Event subject").option("--message <message>", "Event message", "Hasna events test delivery").option("--data <json>", "Event data JSON object").option("-j, --json", "Print JSON output", false).action(async (id, actionOptions, command) => {
     const result2 = await createClient(options).testChannel(id, {
       source: options.source,
       type: actionOptions.type,
@@ -85366,13 +85670,13 @@ function registerWebhookCommands(program2, options) {
       message: actionOptions.message,
       data: parseJsonObject(actionOptions.data, { test: true })
     });
-    print(result2, Boolean(actionOptions.json), `${result2.status}: ${result2.channelId}`);
+    print(result2, wantsJson(actionOptions, command), `${result2.status}: ${result2.channelId}`);
   });
   return webhooks;
 }
 function registerEventCommands(program2, options) {
   const events = program2.command(options.eventsCommandName ?? "events").description("Emit, list, and replay Hasna events");
-  events.command("emit").description("Emit an event from this app").argument("<type>", "Event type").option("--source <source>", "Event source override").option("--subject <subject>", "Event subject").option("--severity <severity>", "Event severity", "info").option("--message <message>", "Event message").option("--dedupe-key <key>", "Dedupe key").option("--data <json>", "Event data JSON object").option("--metadata <json>", "Event metadata JSON object").option("--no-deliver", "Record without delivering").option("--no-dedupe", "Allow duplicate id/dedupeKey events").option("-j, --json", "Print JSON output", false).action(async (type, actionOptions) => {
+  events.command("emit").description("Emit an event from this app").argument("<type>", "Event type").option("--source <source>", "Event source override").option("--subject <subject>", "Event subject").option("--severity <severity>", "Event severity", "info").option("--message <message>", "Event message").option("--dedupe-key <key>", "Dedupe key").option("--data <json>", "Event data JSON object").option("--metadata <json>", "Event metadata JSON object").option("--no-deliver", "Record without delivering").option("--no-dedupe", "Allow duplicate id/dedupeKey events").option("-j, --json", "Print JSON output", false).action(async (type, actionOptions, command) => {
     const result2 = await createClient(options).emit({
       source: actionOptions.source ?? options.source,
       type,
@@ -85383,9 +85687,9 @@ function registerEventCommands(program2, options) {
       data: parseJsonObject(actionOptions.data, {}),
       metadata: parseJsonObject(actionOptions.metadata, {})
     }, { deliver: actionOptions.deliver, dedupe: actionOptions.dedupe });
-    print(result2, Boolean(actionOptions.json), `${result2.deduped ? "Deduped" : "Emitted"} ${result2.event.id} to ${result2.deliveries.length} channel(s)`);
+    print(result2, wantsJson(actionOptions, command), `${result2.deduped ? "Deduped" : "Emitted"} ${result2.event.id} to ${result2.deliveries.length} channel(s)`);
   });
-  events.command("list").description("List recorded events").option("--source <source>", "Filter by source").option("--type <type>", "Filter by type").option("--limit <n>", "Limit results", parseNumber).option("-j, --json", "Print JSON output", false).action(async (actionOptions) => {
+  events.command("list").description("List recorded events").option("--source <source>", "Filter by source").option("--type <type>", "Filter by type").option("--limit <n>", "Limit results", parseNumber).option("-j, --json", "Print JSON output", false).action(async (actionOptions, command) => {
     let rows = await createClient(options).listEvents();
     if (actionOptions.source)
       rows = rows.filter((event) => event.source === actionOptions.source);
@@ -85393,7 +85697,7 @@ function registerEventCommands(program2, options) {
       rows = rows.filter((event) => event.type === actionOptions.type);
     if (actionOptions.limit)
       rows = rows.slice(-actionOptions.limit);
-    if (actionOptions.json) {
+    if (wantsJson(actionOptions, command)) {
       console.log(JSON.stringify(rows, null, 2));
       return;
     }
@@ -85404,14 +85708,14 @@ function registerEventCommands(program2, options) {
     for (const event of rows)
       console.log(`${event.time}	${event.id}	${event.source}	${event.type}	${event.severity}`);
   });
-  events.command("replay").description("Replay recorded events").option("--id <id>", "Replay one event id").option("--source <source>", "Filter by source").option("--type <type>", "Filter by type").option("--dry-run", "Preview without delivery", false).option("-j, --json", "Print JSON output", false).action(async (actionOptions) => {
+  events.command("replay").description("Replay recorded events").option("--id <id>", "Replay one event id").option("--source <source>", "Filter by source").option("--type <type>", "Filter by type").option("--dry-run", "Preview without delivery", false).option("-j, --json", "Print JSON output", false).action(async (actionOptions, command) => {
     const result2 = await createClient(options).replay({
       eventId: actionOptions.id,
       source: actionOptions.source,
       type: actionOptions.type,
       dryRun: actionOptions.dryRun
     });
-    print(result2, Boolean(actionOptions.json), `Replayed ${result2.events.length} event(s), ${result2.deliveries.length} delivery result(s)`);
+    print(result2, wantsJson(actionOptions, command), `Replayed ${result2.events.length} event(s), ${result2.deliveries.length} delivery result(s)`);
   });
   return events;
 }