autohand-cli 0.9.0 → 0.9.2

package/dist/chunk-3DF3GZQ7.js

@@ -0,0 +1,277 @@
+import {
+  showModal
+} from "./chunk-LOSXLH7P.js";
+import {
+  saveConfig
+} from "./chunk-CM24K6ZT.js";
+import {
+  t
+} from "./chunk-SJQU2ZFR.js";
+
+// src/commands/statusline.ts
+import chalk from "chalk";
+
+// src/core/agent/StatusLineSettings.ts
+var DEFAULT_PULL_REQUEST_NUMBER = 123;
+var DEFAULT_WORKSPACE_PATH_LIMIT = 44;
+var DEFAULT_GIT_LABEL_LIMIT = 24;
+var STATUS_LINE_SETTING_KEYS = [
+  "showProviderModel",
+  "showContext",
+  "showWorkspacePath",
+  "showGitBranch",
+  "showCommandHint",
+  "showPullRequest",
+  "showSessionLines",
+  "showQueue",
+  "showActiveStatus",
+  "showActiveMetrics",
+  "showCancelHint"
+];
+var DEFAULT_STATUS_LINE_SETTINGS = {
+  showProviderModel: true,
+  showContext: true,
+  showWorkspacePath: true,
+  showGitBranch: true,
+  showCommandHint: true,
+  showPullRequest: true,
+  showSessionLines: false,
+  showQueue: true,
+  showActiveStatus: true,
+  showActiveMetrics: true,
+  showCancelHint: true
+};
+function resolveStatusLineSettings(settings) {
+  return {
+    ...DEFAULT_STATUS_LINE_SETTINGS,
+    ...settings
+  };
+}
+function isStatusLineSettingKey(value) {
+  return STATUS_LINE_SETTING_KEYS.includes(value);
+}
+function getConfigStatusLineSettings(config) {
+  return resolveStatusLineSettings(config?.ui?.statusLine);
+}
+function formatPullRequestSegment(pullRequestNumber) {
+  const normalized = typeof pullRequestNumber === "string" ? pullRequestNumber.trim().replace(/^#/, "") : pullRequestNumber;
+  const value = normalized || DEFAULT_PULL_REQUEST_NUMBER;
+  return `PR #${value}`;
+}
+function formatSessionDiffStats(stats) {
+  if (!stats) {
+    return [];
+  }
+  return [
+    stats.added > 0 ? `+${stats.added} lines` : "",
+    stats.removed > 0 ? `-${stats.removed} lines` : ""
+  ].filter(Boolean);
+}
+function truncateMiddle(value, limit) {
+  if (limit <= 0) {
+    return "";
+  }
+  if (value.length <= limit) {
+    return value;
+  }
+  if (limit === 1) {
+    return "\u2026";
+  }
+  const left = Math.ceil((limit - 1) / 2);
+  const right = Math.floor((limit - 1) / 2);
+  return `${value.slice(0, left)}\u2026${value.slice(value.length - right)}`;
+}
+function formatWorkspacePathSegment(workspaceRoot, options = {}) {
+  const trimmed = workspaceRoot?.trim();
+  if (!trimmed) {
+    return "";
+  }
+  const homeDir = options.homeDir?.replace(/\/+$/, "");
+  const normalized = homeDir && (trimmed === homeDir || trimmed.startsWith(`${homeDir}/`)) ? `~${trimmed.slice(homeDir.length)}` : trimmed;
+  return truncateMiddle(normalized, options.limit ?? DEFAULT_WORKSPACE_PATH_LIMIT);
+}
+function formatGitLabelSegment(gitLabel, options = {}) {
+  const trimmed = gitLabel?.trim();
+  if (!trimmed) {
+    return "";
+  }
+  return truncateMiddle(trimmed, options.limit ?? DEFAULT_GIT_LABEL_LIMIT);
+}
+function formatStatusLineLeft(input) {
+  const percent = Number.isFinite(input.contextPercentLeft) ? Math.max(0, Math.min(100, input.contextPercentLeft)) : 100;
+  const contextSegment = input.contextStatus?.trim() ? `${input.planIndicator ?? ""}${input.contextStatus.trim()}` : `${input.planIndicator ?? ""}${percent}% context left`;
+  const sessionDiffSegment = input.settings.showSessionLines && input.sessionHasFileChanges ? formatSessionDiffStats(input.sessionDiffStats).join(` ${String.fromCharCode(183)} `) : "";
+  const workspaceSegment = input.settings.showWorkspacePath ? formatWorkspacePathSegment(input.workspaceRoot, { homeDir: input.homeDir }) : "";
+  const gitSegment = input.settings.showGitBranch ? formatGitLabelSegment(input.gitLabel) : "";
+  const queueStatus = input.settings.showQueue && input.queueCount > 0 ? ` ${String.fromCharCode(183)} ${input.queueCount} queued` : "";
+  const segments = [
+    input.settings.showContext ? contextSegment : (input.planIndicator ?? "").trim(),
+    workspaceSegment,
+    gitSegment,
+    input.settings.showCommandHint ? input.commandHint : "",
+    input.settings.showPullRequest ? formatPullRequestSegment(input.pullRequestNumber) : "",
+    sessionDiffSegment
+  ].filter((segment) => segment.trim().length > 0);
+  return `${segments.join(` ${String.fromCharCode(183)} `)}${queueStatus}`;
+}
+function buildStatusLineExtension(input) {
+  const hiddenDefaultSegmentIds = [
+    input.settings.showProviderModel ? "" : "provider",
+    input.settings.showContext ? "" : "context",
+    input.settings.showCommandHint ? "" : "command-hint"
+  ].filter(Boolean);
+  const hiddenStatusSegmentIds = [
+    input.settings.showActiveStatus ? "" : "status",
+    input.settings.showActiveMetrics ? "" : "metrics",
+    input.settings.showQueue ? "" : "queue",
+    input.settings.showCancelHint ? "" : "cancel"
+  ].filter(Boolean);
+  const helpSegments = [
+    input.settings.showWorkspacePath ? {
+      id: "workspace-path",
+      text: formatWorkspacePathSegment(input.workspaceRoot, { homeDir: input.homeDir }),
+      color: "success"
+    } : null,
+    input.settings.showGitBranch ? {
+      id: "git-branch",
+      text: formatGitLabelSegment(input.gitLabel),
+      color: "muted"
+    } : null,
+    input.settings.showPullRequest ? { id: "pull-request", text: formatPullRequestSegment(input.pullRequestNumber), color: "muted" } : null,
+    ...input.settings.showSessionLines && input.sessionHasFileChanges ? [
+      {
+        id: "session-lines-added",
+        text: input.sessionDiffStats && input.sessionDiffStats.added > 0 ? `+${input.sessionDiffStats.added} lines` : "",
+        color: "success"
+      },
+      {
+        id: "session-lines-removed",
+        text: input.sessionDiffStats && input.sessionDiffStats.removed > 0 ? `-${input.sessionDiffStats.removed} lines` : "",
+        color: "error"
+      }
+    ] : []
+  ].filter(
+    (segment) => segment !== null && segment.text.trim().length > 0
+  );
+  if (helpSegments.length === 0 && hiddenDefaultSegmentIds.length === 0) {
+    if (hiddenStatusSegmentIds.length === 0) {
+      return void 0;
+    }
+    return {
+      status: {
+        hiddenDefaultSegmentIds: hiddenStatusSegmentIds
+      }
+    };
+  }
+  if (hiddenStatusSegmentIds.length === 0) {
+    return {
+      help: {
+        hiddenDefaultSegmentIds,
+        segments: helpSegments
+      }
+    };
+  }
+  return {
+    status: {
+      hiddenDefaultSegmentIds: hiddenStatusSegmentIds
+    },
+    help: {
+      hiddenDefaultSegmentIds,
+      segments: helpSegments
+    }
+  };
+}
+
+// src/commands/statusline.ts
+var STATUS_LINE_LABEL_KEYS = {
+  showProviderModel: "commands.statusline.fields.showProviderModel",
+  showContext: "commands.statusline.fields.showContext",
+  showWorkspacePath: "commands.statusline.fields.showWorkspacePath",
+  showGitBranch: "commands.statusline.fields.showGitBranch",
+  showCommandHint: "commands.statusline.fields.showCommandHint",
+  showPullRequest: "commands.statusline.fields.showPullRequest",
+  showSessionLines: "commands.statusline.fields.showSessionLines",
+  showQueue: "commands.statusline.fields.showQueue",
+  showActiveStatus: "commands.statusline.fields.showActiveStatus",
+  showActiveMetrics: "commands.statusline.fields.showActiveMetrics",
+  showCancelHint: "commands.statusline.fields.showCancelHint"
+};
+var STATUS_LINE_DESCRIPTION_KEYS = {
+  showProviderModel: "commands.statusline.fields.showProviderModelDesc",
+  showContext: "commands.statusline.fields.showContextDesc",
+  showWorkspacePath: "commands.statusline.fields.showWorkspacePathDesc",
+  showGitBranch: "commands.statusline.fields.showGitBranchDesc",
+  showCommandHint: "commands.statusline.fields.showCommandHintDesc",
+  showPullRequest: "commands.statusline.fields.showPullRequestDesc",
+  showSessionLines: "commands.statusline.fields.showSessionLinesDesc",
+  showQueue: "commands.statusline.fields.showQueueDesc",
+  showActiveStatus: "commands.statusline.fields.showActiveStatusDesc",
+  showActiveMetrics: "commands.statusline.fields.showActiveMetricsDesc",
+  showCancelHint: "commands.statusline.fields.showCancelHintDesc"
+};
+function buildOptions(settings) {
+  return [
+    ...STATUS_LINE_SETTING_KEYS.map((key) => ({
+      label: t(STATUS_LINE_LABEL_KEYS[key]),
+      value: key,
+      description: t(STATUS_LINE_DESCRIPTION_KEYS[key]),
+      checked: settings[key]
+    })),
+    {
+      label: t("commands.statusline.done"),
+      value: "__done__"
+    }
+  ];
+}
+function persistDraft(config, draft) {
+  config.ui = {
+    ...config.ui,
+    statusLine: draft
+  };
+}
+async function statusline(ctx) {
+  const draft = { ...resolveStatusLineSettings(ctx.config.ui?.statusLine) };
+  const initial = JSON.stringify(draft);
+  const options = buildOptions(draft);
+  const result = await showModal({
+    title: t("commands.statusline.title"),
+    options,
+    multiSelect: true,
+    maxVisible: options.length,
+    onToggle: (option, checked) => {
+      if (isStatusLineSettingKey(option.value)) {
+        draft[option.value] = checked;
+      }
+    }
+  });
+  if (!result) {
+    return null;
+  }
+  if (isStatusLineSettingKey(result.value)) {
+    draft[result.value] = !draft[result.value];
+  }
+  if (JSON.stringify(draft) === initial) {
+    return null;
+  }
+  persistDraft(ctx.config, draft);
+  await saveConfig(ctx.config);
+  return chalk.green(t("commands.statusline.saved"));
+}
+var metadata = {
+  command: "/statusline",
+  description: "configure status line display",
+  implemented: true
+};
+
+export {
+  getConfigStatusLineSettings,
+  formatStatusLineLeft,
+  buildStatusLineExtension,
+  statusline,
+  metadata
+};
+/**
+ * @license
+ * Copyright 2026 Autohand AI LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */

package/dist/{chunk-E26KKI46.cjs → chunk-3JURXAL6.cjs}

@@ -45,7 +45,9 @@ var AUTOHAND_FILES = {
   /** Telemetry queue */
   telemetryQueue: _path2.default.join(AUTOHAND_PATHS.telemetry, "queue.json"),
   /** Session sync queue */
-  sessionSyncQueue: _path2.default.join(AUTOHAND_PATHS.telemetry, "session-sync-queue.json")
+  sessionSyncQueue: _path2.default.join(AUTOHAND_PATHS.telemetry, "session-sync-queue.json"),
+  /** Last successful remote feature flag evaluation */
+  featureFlagsCache: _path2.default.join(AUTOHAND_HOME, "feature-flags.json")
 };
 var PROJECT_DIR_NAME = ".autohand";
 var getAuthBaseUrl = () => process["env"]["AUTOHAND_API_URL"] || "https://autohand.ai";
@@ -76,16 +78,66 @@ var SYNC_CONFIG = {
   /** Request timeout in ms */
   timeout: 3e4
 };
-var SKILL_LOCATIONS = [
-  { basePath: _path2.default.join(_os2.default.homedir(), ".codex", "skills"), source: "codex-user", recursive: true },
-  { basePath: _path2.default.join(_os2.default.homedir(), ".claude", "skills"), source: "claude-user", recursive: false },
-  // Project-level Claude skills are resolved at runtime with workspaceRoot
-  { basePath: AUTOHAND_PATHS.skills, source: "autohand-user", recursive: true }
-  // Project-level Autohand skills are resolved at runtime with workspaceRoot
+var THIRD_PARTY_PROJECT_SKILL_DIRS = [
+  ".aider-desk/skills",
+  ".augment/skills",
+  ".bob/skills",
+  ".codeartsdoer/skills",
+  ".codebuddy/skills",
+  ".codemaker/skills",
+  ".codestudio/skills",
+  ".commandcode/skills",
+  ".continue/skills",
+  ".cortex/skills",
+  ".crush/skills",
+  ".devin/skills",
+  ".factory/skills",
+  ".forge/skills",
+  ".goose/skills",
+  ".hermes/skills",
+  ".junie/skills",
+  ".iflow/skills",
+  ".kilocode/skills",
+  ".kiro/skills",
+  ".kode/skills",
+  ".mcpjam/skills",
+  ".vibe/skills",
+  ".mux/skills",
+  ".openhands/skills",
+  ".pi/skills",
+  ".qoder/skills",
+  ".qwen/skills",
+  ".rovodev/skills",
+  ".roo/skills",
+  ".tabnine/agent/skills",
+  ".trae/skills",
+  ".windsurf/skills",
+  ".zencoder/skills",
+  ".neovate/skills",
+  ".pochi/skills",
+  ".adal/skills",
+  ".agent/skills",
+  ".agents/skills",
+  "skills"
 ];
+function getUserSkillLocations(homeDir = _os2.default.homedir(), autohandSkillsDir = AUTOHAND_PATHS.skills) {
+  return [
+    { basePath: _path2.default.join(homeDir, ".codex", "skills"), source: "codex-user", recursive: true },
+    { basePath: _path2.default.join(homeDir, ".claude", "skills"), source: "claude-user", recursive: false },
+    { basePath: _path2.default.join(homeDir, ".agent", "skills"), source: "agent-user", recursive: true },
+    { basePath: _path2.default.join(homeDir, ".agents", "skills"), source: "agent-user", recursive: true },
+    { basePath: autohandSkillsDir, source: "autohand-user", recursive: true }
+  ];
+}
+var SKILL_LOCATIONS = getUserSkillLocations();
 function getProjectSkillLocations(workspaceRoot) {
   return [
     { basePath: _path2.default.join(workspaceRoot, ".claude", "skills"), source: "claude-project", recursive: false },
+    ...THIRD_PARTY_PROJECT_SKILL_DIRS.map((relativePath) => ({
+      basePath: _path2.default.join(workspaceRoot, relativePath),
+      source: "agent-project",
+      recursive: true
+    })),
     { basePath: _path2.default.join(workspaceRoot, PROJECT_DIR_NAME, "skills"), source: "autohand-project", recursive: true }
   ];
 }
@@ -99,7 +151,8 @@ function getProjectSkillLocations(workspaceRoot) {
 
 
 
-exports.AUTOHAND_HOME = AUTOHAND_HOME; exports.AUTOHAND_PATHS = AUTOHAND_PATHS; exports.AUTOHAND_FILES = AUTOHAND_FILES; exports.PROJECT_DIR_NAME = PROJECT_DIR_NAME; exports.AUTH_CONFIG = AUTH_CONFIG; exports.SYNC_CONFIG = SYNC_CONFIG; exports.SKILL_LOCATIONS = SKILL_LOCATIONS; exports.getProjectSkillLocations = getProjectSkillLocations;
+
+exports.AUTOHAND_HOME = AUTOHAND_HOME; exports.AUTOHAND_PATHS = AUTOHAND_PATHS; exports.AUTOHAND_FILES = AUTOHAND_FILES; exports.PROJECT_DIR_NAME = PROJECT_DIR_NAME; exports.AUTH_CONFIG = AUTH_CONFIG; exports.SYNC_CONFIG = SYNC_CONFIG; exports.getUserSkillLocations = getUserSkillLocations; exports.SKILL_LOCATIONS = SKILL_LOCATIONS; exports.getProjectSkillLocations = getProjectSkillLocations;
 /**
  * @license
  * Copyright 2025 Autohand AI LLC

package/dist/{chunk-MOJ7ADW4.cjs → chunk-3KWAP2Y3.cjs}

@@ -1,6 +1,6 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; } var _class;
 
-var _chunkE26KKI46cjs = require('./chunk-E26KKI46.cjs');
+var _chunk3JURXAL6cjs = require('./chunk-3JURXAL6.cjs');
 
 // src/core/agents/AgentRegistry.ts
 var _promises = require('fs/promises'); var _promises2 = _interopRequireDefault(_promises);
@@ -13,6 +13,44 @@ var AgentConfigSchema = _zod.z.object({
   tools: _zod.z.array(_zod.z.string()),
   model: _zod.z.string().optional()
 });
+var InlineAgentInputSchema = _zod.z.object({
+  description: _zod.z.string().min(1, 'agent "description" is required'),
+  prompt: _zod.z.string().min(1, 'agent "prompt" is required'),
+  tools: _zod.z.union([_zod.z.array(_zod.z.string()), _zod.z.string()]).optional(),
+  model: _zod.z.string().optional()
+});
+var InlineAgentsInputSchema = _zod.z.record(_zod.z.string().min(1, "agent name is required"), InlineAgentInputSchema).refine((value) => Object.keys(value).length > 0, { message: "no agents defined" });
+function looksLikeInlineAgents(value) {
+  return value.trim().startsWith("{");
+}
+function normalizeInlineTools(tools) {
+  const values = Array.isArray(tools) ? tools : typeof tools === "string" ? tools.split(",") : [];
+  const cleaned = values.map((tool) => tool.trim()).filter(Boolean);
+  return cleaned.length > 0 ? cleaned : ["*"];
+}
+function parseInlineAgents(input) {
+  let raw = input;
+  if (typeof input === "string") {
+    try {
+      raw = JSON.parse(input);
+    } catch (error) {
+      throw new Error(`invalid JSON (${error.message})`);
+    }
+  }
+  const result = InlineAgentsInputSchema.safeParse(raw);
+  if (!result.success) {
+    const issue = result.error.issues[0];
+    const location = _optionalChain([issue, 'optionalAccess', _ => _.path, 'optionalAccess', _2 => _2.length]) ? `${issue.path.join(".")}: ` : "";
+    throw new Error(`${location}${_nullishCoalesce(_optionalChain([issue, 'optionalAccess', _3 => _3.message]), () => ( "invalid agents definition"))}`);
+  }
+  return Object.entries(result.data).map(([name, def]) => ({
+    name,
+    description: def.description,
+    systemPrompt: def.prompt,
+    tools: normalizeInlineTools(def.tools),
+    model: def.model
+  }));
+}
 function extractMarkdownTitle(content) {
   const lines = content.split(/\r?\n/);
   for (const line of lines) {
@@ -52,10 +90,16 @@ function parseMarkdownAgent(content) {
 var AgentRegistry = (_class = class _AgentRegistry {
   
   __init() {this.agents = /* @__PURE__ */ new Map()}
+  /**
+   * Session-scoped agents injected via `--agents <json>`. Kept separate from
+   * file-loaded agents so they survive `loadAgents()` (which clears `agents`)
+   * and take precedence over agents with the same name.
+   */
+  __init2() {this.sessionAgents = /* @__PURE__ */ new Map()}
   
-  __init2() {this.externalPaths = []}
-  constructor() {;_class.prototype.__init.call(this);_class.prototype.__init2.call(this);
-    this.agentsDir = _chunkE26KKI46cjs.AUTOHAND_PATHS.agents;
+  __init3() {this.externalPaths = []}
+  constructor() {;_class.prototype.__init.call(this);_class.prototype.__init2.call(this);_class.prototype.__init3.call(this);
+    this.agentsDir = _chunk3JURXAL6cjs.AUTOHAND_PATHS.agents;
   }
   static getInstance() {
     if (!_AgentRegistry.instance) {
@@ -76,7 +120,7 @@ var AgentRegistry = (_class = class _AgentRegistry {
    * Apply external agent settings from the loaded Autohand config.
    */
   configureExternalAgents(config) {
-    if (_optionalChain([config, 'optionalAccess', _ => _.enabled]) !== true) {
+    if (_optionalChain([config, 'optionalAccess', _4 => _4.enabled]) !== true) {
       this.setExternalPaths([]);
       return;
     }
@@ -115,7 +159,7 @@ var AgentRegistry = (_class = class _AgentRegistry {
       for (const file of files) {
         const filePath = _path2.default.join(dir, file);
         const stat = await _promises2.default.stat(filePath).catch(() => null);
-        if (!_optionalChain([stat, 'optionalAccess', _2 => _2.isFile, 'call', _3 => _3()])) {
+        if (!_optionalChain([stat, 'optionalAccess', _5 => _5.isFile, 'call', _6 => _6()])) {
           continue;
         }
         if (file.endsWith(".json")) {
@@ -133,10 +177,41 @@ var AgentRegistry = (_class = class _AgentRegistry {
     }
   }
   getAgent(name) {
-    return this.agents.get(name);
+    return _nullishCoalesce(this.sessionAgents.get(name), () => ( this.agents.get(name)));
   }
   getAllAgents() {
-    return Array.from(this.agents.values());
+    const merged = /* @__PURE__ */ new Map();
+    for (const agent of this.agents.values()) {
+      merged.set(agent.name, agent);
+    }
+    for (const agent of this.sessionAgents.values()) {
+      merged.set(agent.name, agent);
+    }
+    return Array.from(merged.values());
+  }
+  /**
+   * Replace the set of session-scoped agents (injected via `--agents <json>`).
+   * Passing an empty array clears any previously registered session agents.
+   */
+  setSessionAgents(defs) {
+    this.sessionAgents.clear();
+    for (const def of defs) {
+      this.sessionAgents.set(def.name, {
+        name: def.name,
+        path: `<inline:${def.name}>`,
+        source: "session",
+        description: def.description,
+        systemPrompt: def.systemPrompt,
+        tools: def.tools.length > 0 ? def.tools : ["*"],
+        model: def.model
+      });
+    }
+  }
+  clearSessionAgents() {
+    this.sessionAgents.clear();
+  }
+  getSessionAgents() {
+    return Array.from(this.sessionAgents.values());
   }
   getAgentsDirectory() {
     return this.agentsDir;
@@ -195,7 +270,11 @@ var AgentRegistry = (_class = class _AgentRegistry {
 
 
 
-exports.AgentConfigSchema = AgentConfigSchema; exports.AgentRegistry = AgentRegistry;
+
+
+
+
+exports.AgentConfigSchema = AgentConfigSchema; exports.InlineAgentInputSchema = InlineAgentInputSchema; exports.InlineAgentsInputSchema = InlineAgentsInputSchema; exports.looksLikeInlineAgents = looksLikeInlineAgents; exports.parseInlineAgents = parseInlineAgents; exports.AgentRegistry = AgentRegistry;
 /**
  * @license
  * Copyright 2025 Autohand AI LLC

package/dist/{chunk-OHWMWKJQ.js → chunk-3MCK6UBL.js}

@@ -1,6 +1,6 @@
 import {
   t
-} from "./chunk-CBFH2J3O.js";
+} from "./chunk-SJQU2ZFR.js";
 
 // src/commands/history.ts
 import chalk from "chalk";

package/dist/{chunk-5VHP6HDQ.js → chunk-3TH7IK4M.js}

@@ -2,8 +2,11 @@ import {
   validateSkillFrontmatter
 } from "./chunk-QHPFA6OE.js";
 import {
-  PROJECT_DIR_NAME
-} from "./chunk-TWQDAUZU.js";
+  AUTOHAND_PATHS,
+  PROJECT_DIR_NAME,
+  getProjectSkillLocations,
+  getUserSkillLocations
+} from "./chunk-PG2JIU5M.js";
 
 // src/skills/SkillsRegistry.ts
 import fs2 from "fs-extra";
@@ -94,13 +97,31 @@ var SkillParser = class {
 
 // src/skills/SkillsRegistry.ts
 var SIMILARITY_THRESHOLD = 0.3;
-var VENDOR_SOURCES = ["codex-user", "claude-user", "codex-project", "claude-project"];
+var BUILTIN_SKILLS_DIR = "builtin";
+function sameResolvedPath(a, b) {
+  return path.resolve(a) === path.resolve(b);
+}
+function createDefaultUserSkillLocations(userSkillsDir, defaultSource, homeDir) {
+  return getUserSkillLocations(homeDir, userSkillsDir).map(
+    (location) => sameResolvedPath(location.basePath, userSkillsDir) ? { ...location, source: defaultSource } : location
+  );
+}
+var VENDOR_SOURCES = [
+  "codex-user",
+  "claude-user",
+  "codex-project",
+  "claude-project",
+  "agent-user",
+  "agent-project"
+];
 var SkillsRegistry = class {
-  constructor(userSkillsDir, defaultSource = "autohand-user") {
+  constructor(userSkillsDir, defaultSource = "autohand-user", options = {}) {
     this.userSkillsDir = userSkillsDir;
+    this.options = options;
     this.defaultSource = defaultSource;
   }
   userSkillsDir;
+  options;
   skills = /* @__PURE__ */ new Map();
   parser = new SkillParser();
   workspaceRoot = null;
@@ -225,17 +246,49 @@ var SkillsRegistry = class {
    * Initialize the registry by loading skills from the user directory
    */
   async initialize() {
-    await this.loadFromDirectory(this.userSkillsDir, this.defaultSource, true);
+    await this.loadBuiltins();
+    for (const location of this.getUserSkillLocations()) {
+      await this.loadFromDirectory(location.basePath, location.source, location.recursive);
+    }
+  }
+  async loadBuiltins() {
+    for (const directory of this.getBuiltinSkillDirectories()) {
+      if (await fs2.pathExists(directory)) {
+        await this.loadFromDirectory(directory, "builtin", true);
+        return;
+      }
+    }
+  }
+  getBuiltinSkillDirectories() {
+    const moduleDir = path.dirname(new URL(import.meta.url).pathname);
+    return [
+      path.join(moduleDir, BUILTIN_SKILLS_DIR),
+      path.join(moduleDir, "skills", BUILTIN_SKILLS_DIR),
+      path.join(moduleDir, "..", "skills", BUILTIN_SKILLS_DIR)
+    ];
+  }
+  getUserSkillLocations() {
+    if (this.options.userSkillLocations) {
+      return this.options.userSkillLocations;
+    }
+    const includeDefaultLocations = this.options.includeDefaultUserSkillLocations ?? sameResolvedPath(this.userSkillsDir, AUTOHAND_PATHS.skills);
+    if (!includeDefaultLocations) {
+      return [{ basePath: this.userSkillsDir, source: this.defaultSource, recursive: true }];
+    }
+    return createDefaultUserSkillLocations(
+      this.userSkillsDir,
+      this.defaultSource,
+      this.options.homeDir
+    );
   }
   /**
    * Set the workspace root and load project-level skills
    */
   async setWorkspace(workspaceRoot) {
     this.workspaceRoot = workspaceRoot;
-    const claudeProjectSkillsDir = path.join(workspaceRoot, ".claude", "skills");
-    await this.loadFromDirectory(claudeProjectSkillsDir, "claude-project", false);
-    const autohandProjectSkillsDir = path.join(workspaceRoot, PROJECT_DIR_NAME, "skills");
-    await this.loadFromDirectory(autohandProjectSkillsDir, "autohand-project", true);
+    for (const location of getProjectSkillLocations(workspaceRoot)) {
+      await this.loadFromDirectory(location.basePath, location.source, location.recursive);
+    }
   }
   /**
    * Add an additional skill location to search