@promptscript/cli 1.18.1 → 1.19.1

package/index.js

@@ -113,7 +113,9 @@ var init_target_output_paths = __esm({
       mimo: "AGENTS.md",
       "deep-agents": "AGENTS.md",
       forgecode: "AGENTS.md",
-      hermes: "AGENTS.md"
+      hermes: "AGENTS.md",
+      // GitLab Duo (Agent Platform)
+      "gitlab-duo": "AGENTS.md"
     };
     DEFAULT_OUTPUT_PATHS = DEFAULT_OUTPUT_PATH_VALUES;
   }
@@ -184,7 +186,9 @@ var init_config = __esm({
       "mimo",
       "deep-agents",
       "forgecode",
-      "hermes"
+      "hermes",
+      // GitLab Duo (Agent Platform)
+      "gitlab-duo"
     ];
   }
 });
@@ -914,10 +918,12 @@ var init_levenshtein = __esm({
 
 // packages/core/src/utils/markers.ts
 function stripPromptScriptMarkers(content) {
-  return content.replace(new RegExp(`${HTML_MARKER}\\n*`, "g"), "").replace(new RegExp(`${YAML_MARKER}[^\\n]+\\n*`, "g"), "");
+  return content.replace(new RegExp(`${HTML_MARKER}\\n*`, "g"), "").replace(new RegExp(`${TYPESCRIPT_MARKER}[^\\n]+\\n*`, "g"), "").replace(new RegExp(`${LEGACY_TYPESCRIPT_MARKER}\\n*`, "g"), "").replace(new RegExp(`${YAML_MARKER}[^\\n]+\\n*`, "g"), "");
 }
 function isGeneratedByPromptScript(content) {
-  const head = new RegExp(`^\\s*(?:${YAML_MARKER}|${HTML_MARKER})`);
+  const head = new RegExp(
+    `^\\s*(?:${YAML_MARKER}|${TYPESCRIPT_MARKER}|${LEGACY_TYPESCRIPT_MARKER}|${HTML_MARKER})`
+  );
   return content.split("\n", 5).some((line) => head.test(line));
 }
 function stripFrontmatterMarkerLines(frontmatter) {
@@ -927,12 +933,14 @@ function stripFrontmatterMarkerLines(frontmatter) {
 function stripLeadingHtmlMarker(body) {
   return body.replace(new RegExp(`^\\s*${HTML_MARKER}\\n*`), "");
 }
-var HTML_MARKER, YAML_MARKER;
+var HTML_MARKER, YAML_MARKER, TYPESCRIPT_MARKER, LEGACY_TYPESCRIPT_MARKER;
 var init_markers = __esm({
   "packages/core/src/utils/markers.ts"() {
     "use strict";
     HTML_MARKER = "<!--\\s*PromptScript [^>]+-->";
     YAML_MARKER = "#\\s*promptscript-generated:";
+    TYPESCRIPT_MARKER = "//\\s*promptscript-generated:";
+    LEGACY_TYPESCRIPT_MARKER = "//\\s*Generated by PromptScript - do not edit\\.";
   }
 });
 
@@ -5092,10 +5100,21 @@ var init_hook_capabilities = __esm({
         }
       },
       opencode: {
-        ...UNSUPPORTED_CAPABILITY,
-        status: "plugin-only",
-        fallback: "OpenCode lifecycle events require a JavaScript or TypeScript plugin; use `prs compile --watch` for regeneration.",
-        documentationUrl: "https://opencode.ai/docs/plugins/"
+        status: "native",
+        configPath: ".opencode/plugins/promptscript.ts",
+        events: ["pre-tool-use", "post-tool-use"],
+        commandFormat: "generated TypeScript plugin with bounded JSON payloads",
+        timeoutUnit: "milliseconds",
+        projectRootStrategy: "plugin-context",
+        platforms: ["unix"],
+        nativeVersions: ["multifile", "full"],
+        fallback: "Use OpenCode version 'multifile' or 'full'.",
+        documentationUrl: "https://opencode.ai/docs/plugins/",
+        terminal: {
+          guarantee: "not-guaranteed",
+          toolNames: [],
+          notes: "OpenCode exposes tool.execute.before and tool.execute.after only; a dedicated terminal command event is not guaranteed, and MCP tool calls plus some subagent paths may not fire plugin hooks at all."
+        }
       },
       gemini: {
         status: "native",
@@ -5233,7 +5252,8 @@ var init_hook_capabilities = __esm({
       mimo: UNSUPPORTED_CAPABILITY,
       "deep-agents": UNSUPPORTED_CAPABILITY,
       forgecode: UNSUPPORTED_CAPABILITY,
-      hermes: UNSUPPORTED_CAPABILITY
+      hermes: UNSUPPORTED_CAPABILITY,
+      "gitlab-duo": UNSUPPORTED_CAPABILITY
     };
     VSCODE_HOOK_CAPABILITY = {
       status: "compatible",
@@ -6122,12 +6142,12 @@ var init_target_capabilities = __esm({
           simple: { name: "simple", description: "Single OPENCODE.md file", outputPath: "OPENCODE.md" },
           multifile: {
             name: "multifile",
-            description: "OPENCODE.md + .opencode/commands/<name>.md (skills via full mode)",
+            description: "OPENCODE.md + .opencode/commands/<name>.md + .opencode/plugins/promptscript.ts (skills via full mode)",
             outputPath: "OPENCODE.md"
           },
           full: {
             name: "full",
-            description: "Multifile + .opencode/skills/<name>/SKILL.md + .opencode/commands/<name>.md + .opencode/agents/<name>.md",
+            description: "Multifile + .opencode/skills/<name>/SKILL.md + .opencode/commands/<name>.md + .opencode/agents/<name>.md + .opencode/plugins/promptscript.ts",
             outputPath: "OPENCODE.md"
           }
         }
@@ -6832,6 +6852,21 @@ var init_target_capabilities = __esm({
           },
           full: { name: "full", description: "Single AGENTS.md file", outputPath: "AGENTS.md" }
         }
+      },
+      "gitlab-duo": {
+        versions: {
+          simple: { name: "simple", description: "Single AGENTS.md file", outputPath: "AGENTS.md" },
+          multifile: {
+            name: "multifile",
+            description: "Single AGENTS.md file (skills via full mode)",
+            outputPath: "AGENTS.md"
+          },
+          full: {
+            name: "full",
+            description: "Multifile + skills/<name>/SKILL.md",
+            outputPath: "AGENTS.md"
+          }
+        }
       }
     };
   }
@@ -7383,6 +7418,22 @@ var init_target_catalog = __esm({
           hasCommands: false
         }
       },
+      // GitLab Duo (Agent Platform)
+      "gitlab-duo": {
+        name: "gitlab-duo",
+        outputPath: DEFAULT_OUTPUT_PATHS["gitlab-duo"],
+        family: "simple",
+        // Duo reads Agent Skills from a repository-root `skills/` directory,
+        // so the dot-directory skill layout does not apply to this target.
+        features: {
+          defaultEnabled: false,
+          defaultVersion: "full",
+          hasSkills: true,
+          hasAgents: false,
+          hasCommands: false
+        },
+        skillPath: { basePath: "skills", fileName: "SKILL.md" }
+      },
       // AGENTS.md-only targets
       aider: {
         name: "aider",
@@ -7557,6 +7608,89 @@ var init_target_catalog = __esm({
   }
 });
 
+// packages/core/src/agent-capabilities.ts
+function fieldStatus(groups, target) {
+  if (groups.emitted?.includes(target)) return "emitted";
+  if (groups.transformed?.includes(target)) return "transformed";
+  return "not-supported";
+}
+function getAgentFieldStatus(target, field) {
+  return fieldStatus(AGENT_FIELD_STATUS_GROUPS[field], target);
+}
+function listAgentFieldSupportTargets(field) {
+  const groups = AGENT_FIELD_STATUS_GROUPS[field];
+  return { emitted: groups.emitted ?? [], transformed: groups.transformed ?? [] };
+}
+var CANONICAL_AGENT_FIELDS, ALL_NATIVE_AGENT_TARGETS, CLAUDE_CONTRACT_TARGETS, MARKDOWN_CONTRACT_TARGETS, AGENT_FIELD_STATUS_GROUPS;
+var init_agent_capabilities = __esm({
+  "packages/core/src/agent-capabilities.ts"() {
+    "use strict";
+    init_target_catalog();
+    CANONICAL_AGENT_FIELDS = [
+      "description",
+      "content",
+      "tools",
+      "model",
+      "reasoningEffort",
+      "specModel",
+      "specReasoningEffort",
+      "disallowedTools",
+      "permissionMode",
+      "skills",
+      "mcpServers",
+      "sandboxMode",
+      "nicknameCandidates",
+      "handoffs",
+      "maxTurns",
+      "memory",
+      "background",
+      "isolation"
+    ];
+    ALL_NATIVE_AGENT_TARGETS = [
+      "github",
+      "claude",
+      "cursor",
+      "factory",
+      "codex",
+      "opencode",
+      "augment",
+      "amp",
+      "grok"
+    ];
+    CLAUDE_CONTRACT_TARGETS = ["claude", "grok"];
+    MARKDOWN_CONTRACT_TARGETS = ["opencode", "augment", "amp"];
+    AGENT_FIELD_STATUS_GROUPS = {
+      description: { emitted: ALL_NATIVE_AGENT_TARGETS },
+      content: {
+        emitted: [...MARKDOWN_CONTRACT_TARGETS, "github", "claude", "cursor", "factory", "grok"],
+        transformed: ["codex"]
+      },
+      tools: { emitted: [...CLAUDE_CONTRACT_TARGETS, "factory"], transformed: ["github"] },
+      model: {
+        emitted: [...CLAUDE_CONTRACT_TARGETS, "cursor", "factory", "codex"],
+        transformed: ["github"]
+      },
+      reasoningEffort: { emitted: ["factory"], transformed: ["codex"] },
+      specModel: { emitted: ["factory"], transformed: ["github"] },
+      specReasoningEffort: { emitted: ["factory"] },
+      disallowedTools: { emitted: CLAUDE_CONTRACT_TARGETS },
+      permissionMode: { emitted: CLAUDE_CONTRACT_TARGETS },
+      skills: { emitted: CLAUDE_CONTRACT_TARGETS, transformed: ["codex"] },
+      mcpServers: {
+        emitted: [...CLAUDE_CONTRACT_TARGETS, "cursor", "factory"],
+        transformed: ["github", "codex"]
+      },
+      sandboxMode: { transformed: ["codex"] },
+      nicknameCandidates: { transformed: ["codex"] },
+      handoffs: { emitted: ["github"] },
+      maxTurns: { emitted: CLAUDE_CONTRACT_TARGETS },
+      memory: { emitted: CLAUDE_CONTRACT_TARGETS },
+      background: { emitted: CLAUDE_CONTRACT_TARGETS },
+      isolation: { emitted: CLAUDE_CONTRACT_TARGETS }
+    };
+  }
+});
+
 // packages/core/src/git-timeout.ts
 function isGitTimeoutError(error) {
   const errorWithCode = error;
@@ -7795,6 +7929,80 @@ var init_output_plan = __esm({
   }
 });
 
+// packages/core/src/output-resources.ts
+function isOutputResourceKind(value) {
+  return OUTPUT_RESOURCE_KINDS.includes(value);
+}
+function keepBestMatch(current, next) {
+  return current && current.specificity >= next.specificity ? current : next;
+}
+function matchResourcePath(resourcePath, normalizedPath) {
+  const nameIndex = resourcePath.indexOf("<name>");
+  if (nameIndex >= 0) {
+    const prefix = resourcePath.slice(0, nameIndex);
+    return normalizedPath.startsWith(prefix) ? prefix.length : 0;
+  }
+  return resourcePath === normalizedPath ? resourcePath.length + 2 : 0;
+}
+function normalizeBaseDir(dir) {
+  return dir.replaceAll("\\", "/").split("/").filter(Boolean).join("/");
+}
+function hooksSiblingSpecificity(resource, normalizedPath) {
+  const directory = resource.path.slice(0, resource.path.lastIndexOf("/"));
+  if (!directory.endsWith("/hooks")) return 0;
+  if (!normalizedPath.startsWith(`${directory}/`)) return 0;
+  if (normalizedPath.slice(directory.length + 1).includes("/")) return 0;
+  return directory.length + 2;
+}
+function matchCatalogResource(target, normalizedPath) {
+  let best;
+  for (const resource of TARGET_CAPABILITIES[target].resources) {
+    let next;
+    if (resource.kind === "main") {
+      const specificity = matchResourcePath(resource.path, normalizedPath);
+      if (specificity > 0) {
+        next = { kind: "main", specificity };
+      }
+    } else {
+      const specificity = matchResourcePath(resource.path, normalizedPath) || (resource.kind === "hooks" ? hooksSiblingSpecificity(resource, normalizedPath) : 0);
+      if (specificity > 0) {
+        next = { kind: resource.kind, specificity };
+      }
+    }
+    if (next) {
+      best = keepBestMatch(best, next);
+    }
+  }
+  return best?.kind;
+}
+function classifyOutputResource(target, path2, skillBaseDir) {
+  const normalizedPath = path2.replaceAll("\\", "/");
+  const catalogKind = isKnownTarget(target) ? matchCatalogResource(target, normalizedPath) : void 0;
+  if (catalogKind) return catalogKind;
+  const baseDir = skillBaseDir ? normalizeBaseDir(skillBaseDir) : "";
+  if (baseDir && (normalizedPath === baseDir || normalizedPath.startsWith(`${baseDir}/`))) {
+    return "skills";
+  }
+  return "main";
+}
+var OUTPUT_RESOURCE_KINDS;
+var init_output_resources = __esm({
+  "packages/core/src/output-resources.ts"() {
+    "use strict";
+    init_target_catalog();
+    init_config();
+    OUTPUT_RESOURCE_KINDS = [
+      "agents",
+      "skills",
+      "commands",
+      "mcp",
+      "hooks",
+      "plugins",
+      "main"
+    ];
+  }
+});
+
 // packages/core/src/index.ts
 var init_src = __esm({
   "packages/core/src/index.ts"() {
@@ -7818,10 +8026,12 @@ var init_src = __esm({
     init_section_registry();
     init_target_catalog();
     init_target_capabilities();
+    init_agent_capabilities();
     init_hook_capabilities();
     init_git_timeout();
     init_structured_output();
     init_output_plan();
+    init_output_resources();
   }
 });
 
@@ -17039,12 +17249,35 @@ var init_visitor2 = __esm({
         return expression ? expression.loc : fallbackLoc;
       }
       parseTextBlock(token) {
-        let value = token.image.slice(3, -3).trim();
+        let value = this.normalizeTextBlockIndent(token.image.slice(3, -3));
         if (this.interpolateEnv) {
           value = this.interpolateEnvVars(value);
         }
         return value;
       }
+      /**
+       * Strip the common leading whitespace shared by the non-empty lines of a
+       * text block, then trim. A plain trim() would leave the first line at
+       * column 0 while every following line keeps its source indentation, so
+       * markdown consumers read the block body indent as list nesting. Stripping
+       * the common indent keeps relative (nested) indentation intact.
+       */
+      normalizeTextBlockIndent(raw) {
+        let minIndent = Infinity;
+        for (const line of raw.split("\n")) {
+          if (line.trim().length === 0) continue;
+          const match2 = /^([ \t]*)/.exec(line);
+          const indent = match2?.[1]?.length ?? 0;
+          if (indent < minIndent) {
+            minIndent = indent;
+            if (minIndent === 0) break;
+          }
+        }
+        if (minIndent === Infinity || minIndent === 0) {
+          return raw.trim();
+        }
+        return raw.split("\n").map((line) => line.slice(minIndent)).join("\n").trim();
+      }
       /**
        * Parse a string literal, handling escape sequences.
        */
@@ -18600,6 +18833,52 @@ var init_extractors = __esm({
   }
 });
 
+// packages/formatters/src/section-title-resolver.ts
+function presentationSectionId(blockName, entry) {
+  if (entry.sectionId) return getSectionContract(entry.sectionId)?.id ?? entry.sectionId;
+  return getPrimarySectionForBlock(blockName)?.id;
+}
+function sourceTitle(ast, section) {
+  const owners = [section.primaryOwner, ...section.fallbackOwners];
+  for (const source of ["explicit", "legacy"]) {
+    for (const owner of owners) {
+      const candidates = ast.blocks.filter((block) => block.name === owner).flatMap(
+        (block) => (block.canonicalBody?.entries ?? []).filter(
+          (entry) => entry.type === "PresentationEntry" && entry.source === source && presentationSectionId(block.name, entry) === section.id
+        )
+      );
+      const selected = candidates.at(-1);
+      if (selected) return selected.title;
+    }
+  }
+  return void 0;
+}
+function resolveSourceSectionTitle(ast, sectionIdOrAlias) {
+  const section = getSectionContract(sectionIdOrAlias);
+  return section ? sourceTitle(ast, section) : void 0;
+}
+function configuredTitle(section, titles) {
+  if (!titles) return void 0;
+  for (const key of [section.id, ...section.formatterAliases]) {
+    const title = titles[key];
+    if (title !== void 0) return title;
+  }
+  return void 0;
+}
+function resolveSectionTitle(ast, sectionIdOrAlias, options = {}) {
+  const section = getSectionContract(sectionIdOrAlias);
+  if (!section) {
+    return options.defaultTitle ?? sectionIdOrAlias;
+  }
+  return (options.sourceOverrides === false ? void 0 : sourceTitle(ast, section)) ?? configuredTitle(section, options.formatterTitles) ?? options.defaultTitle ?? section.defaultTitle;
+}
+var init_section_title_resolver = __esm({
+  "packages/formatters/src/section-title-resolver.ts"() {
+    "use strict";
+    init_src();
+  }
+});
+
 // packages/formatters/src/base-formatter.ts
 import { posix } from "path";
 var BaseFormatter;
@@ -18609,6 +18888,7 @@ var init_base_formatter = __esm({
     init_src();
     init_convention_renderer();
     init_extractors();
+    init_section_title_resolver();
     BaseFormatter = class _BaseFormatter {
       /**
        * Canonical entry point for legacy implementations.
@@ -18793,6 +19073,21 @@ var init_base_formatter = __esm({
         }
         return this.valueToString(value).split("\n")[0] ?? fallback;
       }
+      /**
+       * Whether the `@context` block's text is consumed by the project/intro
+       * fallback. Must mirror the project() and intro() consumption conditions
+       * exactly, otherwise the context section would either duplicate the text
+       * (predicate too narrow) or drop it entirely (predicate too wide).
+       */
+      contextTextConsumedByProject(ast) {
+        const identity = this.findBlock(ast, "identity");
+        if (identity) return false;
+        const context = this.findBlock(ast, "context");
+        if (!context) return false;
+        if (resolveSourceSectionTitle(ast, "context")) return false;
+        const projectTitle = resolveSourceSectionTitle(ast, "project");
+        return context.content.type === "MixedContent" || projectTitle !== void 0;
+      }
       /**
        * `@context` keys that already have a dedicated rendering path. Anything
        * outside this set is generic and must be surfaced by the context section.
@@ -19160,9 +19455,12 @@ var init_base_formatter = __esm({
           return `${skillBasePath}/${skillName}`;
         }
         const normalizedOutputDir = this.normalizeOutputDir(outputDir);
+        if (!normalizedOutputDir) {
+          return `${skillBasePath}/${skillName}`;
+        }
         if (!configuredBaseDir) {
-          const targetRoot = defaultSkillBasePath.replace(/\/skills$/, "");
-          return `${targetRoot}/${normalizedOutputDir}`;
+          const targetRoot = defaultSkillBasePath.replace(/(?:^|\/)skills$/, "");
+          return targetRoot ? `${targetRoot}/${normalizedOutputDir}` : normalizedOutputDir;
         }
         const outputSegments = normalizedOutputDir.split("/").filter((segment) => segment.length > 0);
         const relativeOutputDir = outputSegments[0] === "skills" ? outputSegments.slice(1).join("/") : outputSegments.join("/");
@@ -19726,7 +20024,7 @@ function getEnabledHookScriptResources(hook) {
 }
 function mapEvent(event, target) {
   if (target === "windsurf") return WINDSURF_EVENT_MAP[event][0] ?? null;
-  const map = target === "claude" ? CLAUDE_EVENT_MAP : target === "cursor" ? CURSOR_EVENT_MAP : target === "factory" ? FACTORY_EVENT_MAP : target === "github" ? GITHUB_EVENT_MAP : target === "gemini" ? GEMINI_EVENT_MAP : target === "grok" ? GROK_EVENT_MAP : target === "vscode" ? VSCODE_EVENT_MAP : CODEX_EVENT_MAP;
+  const map = EVENT_MAPS[target] ?? CODEX_EVENT_MAP;
   return map[event] || null;
 }
 function mapEvents(event) {
@@ -19743,6 +20041,7 @@ function getEffectiveMatcher(hook, target) {
 function convertTimeout(timeoutMs, target) {
   if (target === "gemini") return timeoutMs;
   if (target === "windsurf") return timeoutMs;
+  if (target === "opencode") return timeoutMs;
   if (target === "claude" || target === "cursor" || target === "codex" || target === "factory" || target === "github" || target === "vscode" || target === "grok")
     return Math.ceil(timeoutMs / 1e3);
   return timeoutMs;
@@ -20022,7 +20321,37 @@ function generateCodexHookConfig(hooks) {
   }
   return result;
 }
-var HOOK_OWNERSHIP_MARKER, SHELL_SAFE_ARGUMENT, HOST_CWD_STRATEGIES, CLAUDE_EVENT_MAP, CURSOR_EVENT_MAP, CODEX_EVENT_MAP, FACTORY_EVENT_MAP, GITHUB_EVENT_MAP, GEMINI_EVENT_MAP, GROK_EVENT_MAP, WINDSURF_EVENT_MAP, VSCODE_EVENT_MAP, GITHUB_MATCHER_EVENTS;
+function buildOpenCodeHookRule(hook) {
+  const nativeEvent = mapEvent(hook.event, "opencode");
+  if (nativeEvent !== "tool.execute.before" && nativeEvent !== "tool.execute.after") return null;
+  const command = hook.command ?? (hook.script ? [
+    ...getPosixInterpreter(hook.script.interpreter),
+    getScriptPathFromNativeCwd(hook),
+    ...hook.script.args
+  ] : []);
+  if (command.length === 0) return null;
+  const rule = {
+    id: hook.id.replace(/[^A-Za-z0-9._-]/g, "-"),
+    event: nativeEvent,
+    ...hook.matcher !== void 0 ? { matcher: hook.matcher } : {},
+    command,
+    ...hook.cwd !== void 0 && hook.cwd !== "project" ? { cwd: hook.cwd } : {},
+    ...hook.timeoutMs !== void 0 ? { timeoutMs: hook.timeoutMs } : {}
+  };
+  return rule;
+}
+function generateOpenCodePlugin(hooks) {
+  const rules = [];
+  for (const hook of applyHookTargetOverrides(hooks, "opencode")) {
+    if (hook.enabled === false) continue;
+    const rule = buildOpenCodeHookRule(hook);
+    if (rule) rules.push(rule);
+  }
+  if (rules.length === 0) return null;
+  const serializedRules = rules.map((rule) => JSON.stringify(rule));
+  return "// promptscript-generated: opencode-plugin\n// Generated by PromptScript - do not edit.\n// Recompiling the .promptscript sources rewrites this file; manual edits are discarded.\n// Scope: OpenCode fires these hooks for local tool executions only. MCP tool calls,\n// some subagent paths, and failed tool calls have no dedicated plugin hook.\n// OpenCode tool hooks do not expose model or agent context; payloads omit those fields.\n\ninterface OpenCodeHookRule {\n  id: string;\n  event: 'tool.execute.before' | 'tool.execute.after';\n  matcher?: string;\n  command: string[];\n  cwd?: string;\n  timeoutMs?: number;\n}\n\nconst HOOK_RULES: readonly OpenCodeHookRule[] = [\n" + serializedRules.map((rule) => "  " + rule).join(",\n") + "\n];\n" + OPENCODE_PLUGIN_RUNTIME;
+}
+var HOOK_OWNERSHIP_MARKER, SHELL_SAFE_ARGUMENT, HOST_CWD_STRATEGIES, CLAUDE_EVENT_MAP, CURSOR_EVENT_MAP, CODEX_EVENT_MAP, FACTORY_EVENT_MAP, GITHUB_EVENT_MAP, GEMINI_EVENT_MAP, GROK_EVENT_MAP, WINDSURF_EVENT_MAP, VSCODE_EVENT_MAP, OPENCODE_EVENT_MAP, EVENT_MAPS, GITHUB_MATCHER_EVENTS, OPENCODE_PLUGIN_PATH, OPENCODE_PLUGIN_RUNTIME;
 var init_hook_adapters = __esm({
   "packages/formatters/src/hook-adapters.ts"() {
     "use strict";
@@ -20034,6 +20363,7 @@ var init_hook_adapters = __esm({
       "git-root": false,
       "native-cwd": true,
       "workspace-cwd": true,
+      "plugin-context": false,
       none: false
     };
     CLAUDE_EVENT_MAP = {
@@ -20125,12 +20455,199 @@ var init_hook_adapters = __esm({
       notification: "",
       stop: "Stop"
     };
+    OPENCODE_EVENT_MAP = {
+      "pre-terminal-command": "",
+      "pre-tool-use": "tool.execute.before",
+      "post-tool-use": "tool.execute.after",
+      "session-start": "",
+      setup: "",
+      "subagent-start": "",
+      notification: "",
+      stop: ""
+    };
+    EVENT_MAPS = {
+      claude: CLAUDE_EVENT_MAP,
+      cursor: CURSOR_EVENT_MAP,
+      factory: FACTORY_EVENT_MAP,
+      github: GITHUB_EVENT_MAP,
+      gemini: GEMINI_EVENT_MAP,
+      grok: GROK_EVENT_MAP,
+      vscode: VSCODE_EVENT_MAP,
+      opencode: OPENCODE_EVENT_MAP
+    };
     GITHUB_MATCHER_EVENTS = /* @__PURE__ */ new Set([
       "pre-tool-use",
       "post-tool-use",
       "subagent-start",
       "notification"
     ]);
+    OPENCODE_PLUGIN_PATH = ".opencode/plugins/promptscript.ts";
+    OPENCODE_PLUGIN_RUNTIME = `
+const PAYLOAD_LIMIT_BYTES = 32768;
+const DEFAULT_TIMEOUT_MS = 30000;
+const KILL_GRACE_MS = 1000;
+
+interface OpenCodePluginContext {
+  directory: string;
+  worktree?: string;
+}
+
+interface OpenCodeToolInput {
+  tool?: string;
+  sessionID?: string;
+  callID?: string;
+  args?: unknown;
+}
+
+interface OpenCodeToolOutput {
+  args?: unknown;
+}
+
+interface OpenCodeToolResult {
+  title?: unknown;
+  output?: unknown;
+  metadata?: unknown;
+}
+
+interface OpenCodeCompiledRule {
+  rule: OpenCodeHookRule;
+  matcher: RegExp | null;
+}
+
+function safeStringify(value: unknown): string {
+  try {
+    return JSON.stringify(value);
+  } catch {
+    return '{}';
+  }
+}
+
+function payloadByteLength(value: string): number {
+  return new TextEncoder().encode(value).byteLength;
+}
+
+// Keep the payload bounded: drop oversized tool arguments first, then the
+// result object, so the command always receives parseable JSON.
+function boundedPayload(payload: Record<string, unknown>): string {
+  const full = safeStringify(payload);
+  if (payloadByteLength(full) <= PAYLOAD_LIMIT_BYTES) return full;
+  const withoutArgs = { ...payload, args: '[truncated]' };
+  const trimmed = safeStringify(withoutArgs);
+  if (payloadByteLength(trimmed) <= PAYLOAD_LIMIT_BYTES) return trimmed;
+  const withoutResult = safeStringify({ ...withoutArgs, result: '[truncated]' });
+  if (payloadByteLength(withoutResult) <= PAYLOAD_LIMIT_BYTES) return withoutResult;
+  return '{"target":"opencode","args":"[truncated]","result":"[truncated]"}';
+}
+
+function buildPayload(
+  rule: OpenCodeHookRule,
+  input: OpenCodeToolInput,
+  args: unknown,
+  result?: unknown
+): Record<string, unknown> {
+  const payload: Record<string, unknown> = {
+    target: 'opencode',
+    hook: rule.id,
+    event: rule.event === 'tool.execute.before' ? 'pre-tool-use' : 'post-tool-use',
+    tool: input.tool,
+    args,
+    sessionID: input.sessionID,
+    callID: input.callID,
+    timestamp: new Date().toISOString()
+  };
+  if (result !== undefined) payload.result = result;
+  return payload;
+}
+
+// Hooks observe tool execution asynchronously. Failures are logged, and every
+// process gets a bounded lifetime so a broken hook cannot disrupt the session.
+async function runRule(
+  rule: OpenCodeHookRule,
+  projectRoot: string,
+  payload: string
+): Promise<void> {
+  try {
+    const cwd = rule.cwd ? projectRoot + '/' + rule.cwd : projectRoot;
+    const proc = Bun.spawn({
+      cmd: rule.command,
+      cwd,
+      stdin: 'pipe',
+      stdout: 'inherit',
+      stderr: 'inherit'
+    });
+    const timeoutMs = rule.timeoutMs ?? DEFAULT_TIMEOUT_MS;
+    let graceTimer: ReturnType<typeof setTimeout> | undefined;
+    const timer = setTimeout(() => {
+      proc.kill('SIGTERM');
+      graceTimer = setTimeout(() => proc.kill('SIGKILL'), KILL_GRACE_MS);
+    }, timeoutMs);
+    try {
+      proc.stdin.write(payload);
+      proc.stdin.end();
+      const exitCode = await proc.exited;
+      if (exitCode !== 0) {
+        console.error(
+          '[promptscript] opencode hook "' + rule.id + '" exited with code ' + exitCode
+        );
+      }
+    } finally {
+      clearTimeout(timer);
+      if (graceTimer !== undefined) clearTimeout(graceTimer);
+    }
+  } catch (error: unknown) {
+    console.error('[promptscript] opencode hook "' + rule.id + '" failed:', error);
+  }
+}
+
+export const PromptScriptHooks = async (context: OpenCodePluginContext) => {
+  const projectRoot = context.worktree || context.directory;
+  const compiled: OpenCodeCompiledRule[] = [];
+  for (const rule of HOOK_RULES) {
+    if (rule.matcher === undefined) {
+      compiled.push({ rule, matcher: null });
+      continue;
+    }
+    try {
+      compiled.push({ rule, matcher: new RegExp(rule.matcher) });
+    } catch (error: unknown) {
+      console.error(
+        '[promptscript] opencode hook "' + rule.id + '" has an invalid matcher:',
+        rule.matcher
+      );
+    }
+  }
+
+  return {
+    'tool.execute.before': async (input: OpenCodeToolInput, output: OpenCodeToolOutput) => {
+      for (const entry of compiled) {
+        if (entry.rule.event !== 'tool.execute.before') continue;
+        if (entry.matcher !== null && !entry.matcher.test(String(input.tool))) continue;
+        void runRule(
+          entry.rule,
+          projectRoot,
+          boundedPayload(buildPayload(entry.rule, input, output.args))
+        );
+      }
+    },
+    'tool.execute.after': async (input: OpenCodeToolInput, output: OpenCodeToolResult) => {
+      for (const entry of compiled) {
+        if (entry.rule.event !== 'tool.execute.after') continue;
+        if (entry.matcher !== null && !entry.matcher.test(String(input.tool))) continue;
+        const result = {
+          title: output.title,
+          output: output.output,
+          metadata: output.metadata
+        };
+        void runRule(
+          entry.rule,
+          projectRoot,
+          boundedPayload(buildPayload(entry.rule, input, input.args, result))
+        );
+      }
+    }
+  };
+};
+`;
   }
 });
 
@@ -20181,6 +20698,108 @@ var init_hook_capability_warnings = __esm({
   }
 });
 
+// packages/formatters/src/agent-capability-warnings.ts
+function collectAgentEntries(ast) {
+  const agentsBlock = ast.blocks.find((block) => block.name === "agents");
+  if (!agentsBlock) return null;
+  const entries = [];
+  if (agentsBlock.content.type === "ObjectContent" || agentsBlock.content.type === "MixedContent") {
+    for (const [name, value] of Object.entries(agentsBlock.content.properties)) {
+      if (value && typeof value === "object" && !Array.isArray(value)) {
+        const fields = Object.fromEntries(
+          Object.entries(value).filter(([key]) => !key.startsWith("__"))
+        );
+        entries.push({ name, fields });
+      }
+    }
+  }
+  return { location: agentsBlock.loc, entries };
+}
+function describeFieldSupport(field) {
+  const support = listAgentFieldSupportTargets(field);
+  const parts = [];
+  if (support.emitted.length > 0) {
+    parts.push(`emitted by ${support.emitted.join(", ")}`);
+  }
+  if (support.transformed.length > 0) {
+    parts.push(`transformed by ${support.transformed.join(", ")}`);
+  }
+  return parts.length > 0 ? `Field support: ${parts.join("; ")}.` : "";
+}
+function describeBlockOmission(agentsResource, target, version, location, options) {
+  if (!agentsResource) {
+    if (options?.blockWarningHandled) return [];
+    return [
+      {
+        code: AGENT_COMPATIBILITY_CODE,
+        ruleName: "agent-compatibility",
+        message: `Target "${target}" has no native agent output and will omit @agents.`,
+        suggestion: "Compile a target with agent support or move agent guidance into instruction blocks.",
+        location
+      }
+    ];
+  }
+  return [
+    {
+      code: AGENT_COMPATIBILITY_CODE,
+      ruleName: "agent-compatibility",
+      message: `Target "${target}" version "${version}" cannot emit @agents and will omit it.`,
+      suggestion: `Use a version that emits agents: ${agentsResource.versions.join(", ")}.`,
+      location
+    }
+  ];
+}
+function describeFieldLoss(agentName, field, target, location) {
+  if (field === "description" || field === "content") return void 0;
+  const isCanonical = CANONICAL_AGENT_FIELDS.includes(field);
+  const status = isCanonical ? getAgentFieldStatus(target, field) : "not-supported";
+  if (status !== "not-supported") return void 0;
+  return {
+    code: AGENT_COMPATIBILITY_CODE,
+    ruleName: "agent-compatibility",
+    message: `Agent "${agentName}": field "${field}" is not supported by target "${target}" and will be omitted.`,
+    suggestion: isCanonical ? describeFieldSupport(field) : "Not a canonical @agents field; remove it or model it through a supported block.",
+    location
+  };
+}
+function collectEntryFieldWarnings(entry, target, location) {
+  const warnings = [];
+  for (const field of Object.keys(entry.fields)) {
+    const warning = describeFieldLoss(entry.name, field, target, location);
+    if (warning) warnings.push(warning);
+  }
+  return warnings;
+}
+function getAgentCapabilityWarnings(ast, target, version, options) {
+  const agentsBlock = collectAgentEntries(ast);
+  if (!agentsBlock || !isKnownTarget(target)) return [];
+  const agentsResource = TARGET_CAPABILITIES[target].resources.find(
+    (resource) => resource.kind === "agents"
+  );
+  if (!agentsResource?.versions.includes(version)) {
+    return describeBlockOmission(agentsResource, target, version, agentsBlock.location, options);
+  }
+  return agentsBlock.entries.flatMap(
+    (entry) => collectEntryFieldWarnings(entry, target, agentsBlock.location)
+  );
+}
+function appendAgentCapabilityWarnings(output, ast, target, version, options) {
+  const warnings = getAgentCapabilityWarnings(ast, target, version, options);
+  if (warnings.length === 0) return output;
+  return {
+    ...output,
+    warnings: [...output.warnings ?? [], ...warnings]
+  };
+}
+var AGENT_COMPATIBILITY_CODE;
+var init_agent_capability_warnings = __esm({
+  "packages/formatters/src/agent-capability-warnings.ts"() {
+    "use strict";
+    init_src();
+    AGENT_COMPATIBILITY_CODE = "PS4003";
+  }
+});
+
 // packages/formatters/src/mcp-helpers.ts
 function findMcpServersBlock(ast) {
   return ast.blocks.find((b) => b.name === "mcpServers");
@@ -20356,52 +20975,6 @@ var init_mcp_helpers = __esm({
   }
 });
 
-// packages/formatters/src/section-title-resolver.ts
-function presentationSectionId(blockName, entry) {
-  if (entry.sectionId) return getSectionContract(entry.sectionId)?.id ?? entry.sectionId;
-  return getPrimarySectionForBlock(blockName)?.id;
-}
-function sourceTitle(ast, section) {
-  const owners = [section.primaryOwner, ...section.fallbackOwners];
-  for (const source of ["explicit", "legacy"]) {
-    for (const owner of owners) {
-      const candidates = ast.blocks.filter((block) => block.name === owner).flatMap(
-        (block) => (block.canonicalBody?.entries ?? []).filter(
-          (entry) => entry.type === "PresentationEntry" && entry.source === source && presentationSectionId(block.name, entry) === section.id
-        )
-      );
-      const selected = candidates.at(-1);
-      if (selected) return selected.title;
-    }
-  }
-  return void 0;
-}
-function resolveSourceSectionTitle(ast, sectionIdOrAlias) {
-  const section = getSectionContract(sectionIdOrAlias);
-  return section ? sourceTitle(ast, section) : void 0;
-}
-function configuredTitle(section, titles) {
-  if (!titles) return void 0;
-  for (const key of [section.id, ...section.formatterAliases]) {
-    const title = titles[key];
-    if (title !== void 0) return title;
-  }
-  return void 0;
-}
-function resolveSectionTitle(ast, sectionIdOrAlias, options = {}) {
-  const section = getSectionContract(sectionIdOrAlias);
-  if (!section) {
-    return options.defaultTitle ?? sectionIdOrAlias;
-  }
-  return (options.sourceOverrides === false ? void 0 : sourceTitle(ast, section)) ?? configuredTitle(section, options.formatterTitles) ?? options.defaultTitle ?? section.defaultTitle;
-}
-var init_section_title_resolver = __esm({
-  "packages/formatters/src/section-title-resolver.ts"() {
-    "use strict";
-    init_src();
-  }
-});
-
 // packages/formatters/src/markdown-instruction-formatter.ts
 var MarkdownInstructionFormatter;
 var init_markdown_instruction_formatter = __esm({
@@ -20410,6 +20983,7 @@ var init_markdown_instruction_formatter = __esm({
     init_base_formatter();
     init_hook_adapters();
     init_hook_capability_warnings();
+    init_agent_capability_warnings();
     init_mcp_helpers();
     init_section_title_resolver();
     MarkdownInstructionFormatter = class extends BaseFormatter {
@@ -20428,7 +21002,7 @@ var init_markdown_instruction_formatter = __esm({
       }
       getSkillBasePath() {
         if (!this.config.hasSkills) return null;
-        return `${this.config.dotDir}/skills`;
+        return this.config.skillsDir ?? `${this.config.dotDir}/skills`;
       }
       getSkillFileName() {
         if (!this.config.hasSkills) return null;
@@ -20454,7 +21028,10 @@ var init_markdown_instruction_formatter = __esm({
           hookWarnings.length > 0 || !hasEnabledHooks ? /* @__PURE__ */ new Set(["hooks"]) : void 0
         );
         const warnedOutput = unsupportedWarnings.length > 0 ? { ...output, warnings: [...output.warnings ?? [], ...unsupportedWarnings] } : output;
-        return appendTargetHookCapabilityWarnings(warnedOutput, ast, this.name, version);
+        const agentOutput = appendAgentCapabilityWarnings(warnedOutput, ast, this.name, version, {
+          blockWarningHandled: (this.config.unsupportedBlocks ?? []).includes("agents")
+        });
+        return appendTargetHookCapabilityWarnings(agentOutput, ast, this.name, version);
       }
       hasEnabledHooks(ast) {
         const hooksBlock = ast.blocks.find((block) => block.name === "hooks");
@@ -20889,17 +21466,16 @@ var init_markdown_instruction_formatter = __esm({
       context(ast, renderer) {
         const contextBlock = this.findBlock(ast, "context");
         if (!contextBlock) return null;
-        const identity = this.findBlock(ast, "identity");
-        const textIsConsumedByProject = !identity && !resolveSourceSectionTitle(ast, "context");
+        const textIsConsumedByProject = this.contextTextConsumedByProject(ast);
         const propertyItems = this.contextPropertyItems(ast);
         let body = "";
         if (!textIsConsumedByProject) {
           const text = this.extractText(contextBlock.content);
           const archMatch = this.extractSectionWithCodeBlock(text, "## Architecture");
           const strippedText = archMatch ? text.replace(archMatch, "") : text;
-          const remainingText = this.dedent(strippedText);
+          const remainingText = strippedText.trim();
           if (remainingText) {
-            const downgradedText = remainingText.replace(/^(\s*)## /gm, "$1### ");
+            const downgradedText = remainingText.replace(/^([ \t]*)## /gm, "$1### ");
             body = this.normalizeMarkdownForPrettier(downgradedText).trim();
           }
         }
@@ -21114,24 +21690,28 @@ ${list}` : list;
 });
 
 // packages/formatters/src/create-simple-formatter.ts
-function buildVersions(outputPath, dotDir, hasSkills, hasAgents, hasCommands, skillFileName, mcpConfigPath) {
+function buildVersions(inputs) {
+  const { outputPath, dotDir, hasSkills, hasAgents, hasCommands } = inputs;
+  const { skillFileName, skillsInMultifile, mcpConfigPath, skillsDir } = inputs;
   const isNested = outputPath.startsWith(dotDir + "/");
   const simpleDesc = `Single ${outputPath} file`;
-  const skillPath = `${dotDir}/skills/<name>/${skillFileName}`;
+  const defaultSkillsDir = `${dotDir}/skills`;
+  const resolvedSkillsDir = skillsDir ?? defaultSkillsDir;
+  const skillPath = `${resolvedSkillsDir}/<name>/${skillFileName}`;
   const commandPath = `${dotDir}/commands/<name>.md`;
   const agentPath = `${dotDir}/agents/<name>.md`;
-  const describeAdditionalFiles = (version, paths, skillsInFullMode2) => {
-    if (paths.length === 0 && skillsInFullMode2) {
+  const skillsFullModeOnly = hasSkills && !skillsInMultifile;
+  const describeAdditionalFiles = (version, paths, fullModeSkillsOnly) => {
+    if (paths.length === 0 && fullModeSkillsOnly) {
       return `Single ${outputPath} file (skills via full mode)`;
     }
     if (paths.length === 0) return `Single ${outputPath} file`;
     const prefix = !isNested && version === "full" && hasSkills ? "Multifile" : outputPath;
-    const suffix = skillsInFullMode2 ? " (skills via full mode)" : "";
+    const suffix = fullModeSkillsOnly ? " (skills via full mode)" : "";
     return `${prefix} + ${paths.join(" + ")}${suffix}`;
   };
   const multifilePaths = [];
-  const skillsInFullMode = hasSkills && isNested;
-  if (hasSkills && !skillsInFullMode) multifilePaths.push(skillPath);
+  if (hasSkills && skillsInMultifile) multifilePaths.push(skillPath);
   if (hasCommands) multifilePaths.push(commandPath);
   if (mcpConfigPath) multifilePaths.push(mcpConfigPath);
   const fullPaths = [];
@@ -21139,7 +21719,7 @@ function buildVersions(outputPath, dotDir, hasSkills, hasAgents, hasCommands, sk
   if (hasCommands) fullPaths.push(commandPath);
   if (hasAgents) fullPaths.push(agentPath);
   if (mcpConfigPath) fullPaths.push(mcpConfigPath);
-  const multifileDesc = describeAdditionalFiles("multifile", multifilePaths, skillsInFullMode);
+  const multifileDesc = describeAdditionalFiles("multifile", multifilePaths, skillsFullModeOnly);
   const fullDesc = describeAdditionalFiles("full", fullPaths, false);
   return {
     simple: { name: "simple", description: simpleDesc, outputPath },
@@ -21157,20 +21737,24 @@ function createSimpleMarkdownFormatter(opts) {
     hasAgents = false,
     hasCommands = false,
     hasSkills = true,
+    skillsInMultifile = false,
     skillFileName = "SKILL.md",
     mcpConfigPath,
     mcpConfigFormat,
-    unsupportedBlocks
+    unsupportedBlocks,
+    skillsDir
   } = opts;
-  const versions = buildVersions(
+  const versions = buildVersions({
     outputPath,
     dotDir,
     hasSkills,
     hasAgents,
     hasCommands,
+    skillsInMultifile,
     skillFileName,
-    mcpConfigPath
-  );
+    ...mcpConfigPath ? { mcpConfigPath } : {},
+    ...skillsDir ? { skillsDir } : {}
+  });
   class SimpleFormatter extends MarkdownInstructionFormatter {
     constructor() {
       super({
@@ -21184,6 +21768,8 @@ function createSimpleMarkdownFormatter(opts) {
         hasAgents,
         hasCommands,
         hasSkills,
+        skillsInMultifile,
+        ...skillsDir ? { skillsDir } : {},
         ...mcpConfigPath ? { mcpConfigPath } : {},
         ...mcpConfigFormat ? { mcpConfigFormat } : {},
         ...unsupportedBlocks ? { unsupportedBlocks } : {}
@@ -21703,6 +22289,7 @@ var init_github2 = __esm({
     init_mcp_helpers();
     init_hook_adapters();
     init_hook_capability_warnings();
+    init_agent_capability_warnings();
     init_section_title_resolver();
     GITHUB_VERSIONS = {
       simple: {
@@ -21797,6 +22384,7 @@ var init_github2 = __esm({
           output = this.formatSimple(ast, options);
         }
         output = appendTargetHookCapabilityWarnings(output, ast, this.name, version);
+        output = appendAgentCapabilityWarnings(output, ast, this.name, version);
         const hooksBlock = ast.blocks.find((block) => block.name === "hooks");
         const hooks = hooksBlock ? extractHooks(hooksBlock) : [];
         const hookWarnings = hooksBlock && version !== "simple" ? [
@@ -22573,8 +23161,7 @@ ${f.content}`
       contextSection(ast, renderer) {
         const contextBlock = this.findBlock(ast, "context");
         if (!contextBlock) return null;
-        const identity = this.findBlock(ast, "identity");
-        const textIsConsumedByProject = !identity && !resolveSourceSectionTitle(ast, "context");
+        const textIsConsumedByProject = this.contextTextConsumedByProject(ast);
         const propertyItems = this.contextPropertyItems(ast);
         let body = "";
         if (!textIsConsumedByProject) {
@@ -22582,7 +23169,7 @@ ${f.content}`
           const archMatch = this.extractSectionWithCodeBlock(text, "## Architecture");
           const remainingText = archMatch ? text.replace(archMatch, "").trim() : text.trim();
           if (remainingText) {
-            const downgradedText = remainingText.replace(/^(\s*)## /gm, "$1### ");
+            const downgradedText = remainingText.replace(/^([ \t]*)## /gm, "$1### ");
             body = this.stripAllIndent(downgradedText);
           }
         }
@@ -22868,6 +23455,7 @@ var init_claude2 = __esm({
     init_base_formatter();
     init_hook_adapters();
     init_hook_capability_warnings();
+    init_agent_capability_warnings();
     init_mcp_helpers();
     init_section_title_resolver();
     CLAUDE_VERSIONS = {
@@ -22918,6 +23506,7 @@ var init_claude2 = __esm({
           output = this.formatSimple(ast, options);
         }
         output = appendTargetHookCapabilityWarnings(output, ast, this.name, version);
+        output = appendAgentCapabilityWarnings(output, ast, this.name, version);
         output = {
           ...output,
           managedOutputFiles: [
@@ -23686,8 +24275,7 @@ ${f.content}`
       contextSection(ast, renderer) {
         const contextBlock = this.findBlock(ast, "context");
         if (!contextBlock) return null;
-        const identity = this.findBlock(ast, "identity");
-        const textIsConsumedByProject = !identity && !resolveSourceSectionTitle(ast, "context");
+        const textIsConsumedByProject = this.contextTextConsumedByProject(ast);
         const propertyItems = this.contextPropertyItems(ast);
         let body = "";
         if (!textIsConsumedByProject) {
@@ -23695,7 +24283,7 @@ ${f.content}`
           const archMatch = this.extractSectionWithCodeBlock(text, "## Architecture");
           const remainingText = archMatch ? text.replace(archMatch, "").trim() : text.trim();
           if (remainingText) {
-            const downgradedText = remainingText.replace(/^(\s*)## /gm, "$1### ");
+            const downgradedText = remainingText.replace(/^([ \t]*)## /gm, "$1### ");
             body = this.normalizeMarkdownForPrettier(downgradedText).trim();
           }
         }
@@ -23964,6 +24552,7 @@ var init_cursor2 = __esm({
     init_glob_categorizer();
     init_hook_adapters();
     init_hook_capability_warnings();
+    init_agent_capability_warnings();
     init_mcp_helpers();
     init_plugin_helpers();
     init_section_title_resolver();
@@ -24052,10 +24641,11 @@ var init_cursor2 = __esm({
           const hooks = hooksBlock ? extractHooks(hooksBlock) : [];
           const effectiveHooks = applyHookTargetOverrides(hooks, "cursor");
           if (hooksBlock && effectiveHooks.some((hook) => hook.enabled !== false)) {
+            const withAgentWarnings = appendAgentCapabilityWarnings(output, ast, this.name, version);
             return {
-              ...output,
+              ...withAgentWarnings,
               warnings: [
-                ...output.warnings ?? [],
+                ...withAgentWarnings.warnings ?? [],
                 {
                   code: "PS4002",
                   message: `Cursor ${version} mode cannot emit @hooks and will omit them.`,
@@ -24070,6 +24660,7 @@ var init_cursor2 = __esm({
           }
         }
         output = appendTargetHookCapabilityWarnings(output, ast, this.name, version);
+        output = appendAgentCapabilityWarnings(output, ast, this.name, version);
         return {
           ...output,
           managedOutputFiles: [
@@ -24591,10 +25182,14 @@ ${text2.trim()}`;
           }
         }
         const text = this.extractText(context.content);
-        if (text?.includes("Architecture")) {
-          return text.trim();
-        }
-        return null;
+        const archMatch = this.extractSectionWithCodeBlock(text, "## Architecture");
+        if (!archMatch) return null;
+        const content = archMatch.replace("## Architecture", "");
+        const normalizedContent = this.normalizeMarkdownForPrettier(content);
+        const title = resolveSectionTitle(ast, "architecture", { defaultTitle: "Architecture" });
+        return `## ${title}
+
+${normalizedContent.trim()}`;
       }
       contextSection(ast) {
         const context = this.findBlock(ast, "context");
@@ -24606,13 +25201,13 @@ ${text2.trim()}`;
           consumedByIntro ? ["tech-stack", "project"] : ["tech-stack"]
         );
         let body = "";
-        if (resolveSourceSectionTitle(ast, "context")) {
+        if (!this.contextTextConsumedByProject(ast)) {
           const text = this.extractText(context.content);
           const archMatch = this.extractSectionWithCodeBlock(text, "## Architecture");
           const remainingText = archMatch ? text.replace(archMatch, "").trim() : text.trim();
           if (remainingText) {
-            const downgradedText = remainingText.replace(/^(\s*)## /gm, "$1### ");
-            body = this.stripAllIndent(downgradedText);
+            const downgradedText = remainingText.replace(/^([ \t]*)## /gm, "$1### ");
+            body = downgradedText.trim();
           }
         }
         if (propertyItems.length > 0) {
@@ -25480,8 +26075,7 @@ ${this.stripAllIndent(content)}`;
       contextSection(ast, _renderer) {
         const contextBlock = this.findBlock(ast, "context");
         if (!contextBlock) return null;
-        const identity = this.findBlock(ast, "identity");
-        const textIsConsumedByProject = !identity && !resolveSourceSectionTitle(ast, "context");
+        const textIsConsumedByProject = this.contextTextConsumedByProject(ast);
         const propertyItems = this.contextPropertyItems(ast, ["frameworks"]);
         let body = "";
         if (!textIsConsumedByProject) {
@@ -25489,7 +26083,7 @@ ${this.stripAllIndent(content)}`;
           const archMatch = this.extractSectionWithCodeBlock(text, "## Architecture");
           const remainingText = archMatch ? text.replace(archMatch, "").trim() : text.trim();
           if (remainingText) {
-            const downgradedText = remainingText.replace(/^(\s*)## /gm, "$1### ");
+            const downgradedText = remainingText.replace(/^([ \t]*)## /gm, "$1### ");
             body = this.stripAllIndent(downgradedText);
           }
         }
@@ -26721,20 +27315,115 @@ ${filteredFrontmatter}
 });
 
 // packages/formatters/src/formatters/opencode.ts
-var OpenCodeFormatter, OPENCODE_VERSIONS;
+var OPENCODE_VERSIONS, OpenCodeFormatter;
 var init_opencode = __esm({
   "packages/formatters/src/formatters/opencode.ts"() {
     "use strict";
-    init_create_simple_formatter();
-    ({ Formatter: OpenCodeFormatter, VERSIONS: OPENCODE_VERSIONS } = createSimpleMarkdownFormatter({
-      name: "opencode",
-      outputPath: "OPENCODE.md",
-      description: "OpenCode instructions (Markdown)",
-      mainFileHeader: "# OPENCODE.md",
-      dotDir: ".opencode",
-      hasAgents: true,
-      hasCommands: true
-    }));
+    init_hook_adapters();
+    init_markdown_instruction_formatter();
+    OPENCODE_VERSIONS = {
+      simple: {
+        name: "simple",
+        description: "Single OPENCODE.md file",
+        outputPath: "OPENCODE.md"
+      },
+      multifile: {
+        name: "multifile",
+        description: "OPENCODE.md + .opencode/commands/<name>.md + .opencode/plugins/promptscript.ts (skills via full mode)",
+        outputPath: "OPENCODE.md"
+      },
+      full: {
+        name: "full",
+        description: "Multifile + .opencode/skills/<name>/SKILL.md + .opencode/commands/<name>.md + .opencode/agents/<name>.md + .opencode/plugins/promptscript.ts",
+        outputPath: "OPENCODE.md"
+      }
+    };
+    OpenCodeFormatter = class extends MarkdownInstructionFormatter {
+      constructor() {
+        super({
+          name: "opencode",
+          outputPath: "OPENCODE.md",
+          description: "OpenCode instructions (Markdown)",
+          defaultConvention: "markdown",
+          mainFileHeader: "# OPENCODE.md",
+          dotDir: ".opencode",
+          skillFileName: "SKILL.md",
+          hasAgents: true,
+          hasCommands: true,
+          hasSkills: true
+        });
+      }
+      /**
+       * Return supported OpenCode output modes.
+       */
+      static getSupportedVersions() {
+        return OPENCODE_VERSIONS;
+      }
+      /**
+       * Format single-file output while retaining stale-plugin cleanup metadata.
+       */
+      formatSimple(ast, options) {
+        const output = super.formatSimple(ast, options);
+        return {
+          ...output,
+          managedOutputFiles: [
+            .../* @__PURE__ */ new Set([...output.managedOutputFiles ?? [], OPENCODE_PLUGIN_PATH])
+          ]
+        };
+      }
+      /**
+       * Format multifile output and attach the generated hook plugin.
+       */
+      formatMultifile(ast, options) {
+        return this.appendHookPlugin(ast, super.formatMultifile(ast, options));
+      }
+      /**
+       * Format full output and attach the generated hook plugin.
+       */
+      formatFull(ast, options) {
+        return this.appendHookPlugin(ast, super.formatFull(ast, options));
+      }
+      /**
+       * Attach the generated OpenCode plugin and its compatibility warnings.
+       *
+       * The plugin path is always registered as managed output so recompiles and
+       * version downgrades remove only PromptScript-owned files; user plugins in
+       * the same directory are never touched.
+       */
+      appendHookPlugin(ast, output) {
+        const managedFiles = [.../* @__PURE__ */ new Set([...output.managedOutputFiles ?? [], OPENCODE_PLUGIN_PATH])];
+        const hooksBlock = ast.blocks.find((block) => block.name === "hooks");
+        if (!hooksBlock) {
+          return { ...output, managedOutputFiles: managedFiles };
+        }
+        const hooks = extractHooks(hooksBlock);
+        const plugin = generateOpenCodePlugin(hooks);
+        const warnings = [
+          ...getHookCompatibilityWarnings(hooks, "opencode"),
+          ...plugin !== null ? [
+            {
+              code: "PS4002",
+              message: "OpenCode tool hooks do not expose model or agent context; the generated payload omits those fields.",
+              suggestion: "Use sessionID and callID for attribution."
+            }
+          ] : []
+        ].map((warning) => ({ ...warning, location: hooksBlock.loc }));
+        return {
+          ...output,
+          ...plugin !== null ? {
+            additionalFiles: [
+              ...output.additionalFiles ?? [],
+              { path: OPENCODE_PLUGIN_PATH, content: plugin }
+            ]
+          } : {},
+          ...warnings.length > 0 ? { warnings: [...output.warnings ?? [], ...warnings] } : {},
+          managedOutputFiles: managedFiles,
+          managedOutputDirectories: [
+            .../* @__PURE__ */ new Set([...output.managedOutputDirectories ?? [], ".opencode/plugins"])
+          ]
+        };
+      }
+    };
   }
 });
 
@@ -27040,20 +27729,54 @@ ${escaped}"""`;
   }
   return '""';
 }
-function serializeAgentToml(agentName, agent) {
+function mcpServerTomlConfig(server) {
+  const config = {};
+  if (server.command) config["command"] = server.command;
+  if (server.url) config["url"] = server.url;
+  if (server.headers) config["headers"] = server.headers;
+  if (server.env) config["env"] = server.env;
+  return config;
+}
+function agentInstructionsLines(content) {
+  if (content !== null && typeof content === "object" && content.type === "TextContent") {
+    const textContent = content.value ?? "";
+    return [`developer_instructions = ${serializeTomlValue(textContent)}`];
+  }
+  if (typeof content === "string") {
+    return [`developer_instructions = ${serializeTomlValue(content)}`];
+  }
+  return [];
+}
+function mcpServerTomlTableHeader(serverName) {
+  return /^[A-Za-z0-9_-]+$/.test(serverName) ? `[mcp_servers.${serverName}]` : `[mcp_servers."${escapeTomlString2(serverName)}"]`;
+}
+function mcpServerTableLines(serverName, config) {
+  return [
+    mcpServerTomlTableHeader(serverName),
+    ...Object.entries(config).map(([key, val]) => `${key} = ${serializeTomlValue(val)}`)
+  ];
+}
+function agentMcpServerLines(mcpServers, resolvedMcpServers) {
+  if (mcpServers !== null && typeof mcpServers === "object" && !Array.isArray(mcpServers)) {
+    const servers = mcpServers;
+    return Object.entries(servers).filter(([, config]) => config !== null && typeof config === "object").flatMap(([name, config]) => mcpServerTableLines(name, config));
+  }
+  if (Array.isArray(mcpServers)) {
+    return mcpServers.filter((serverName) => typeof serverName === "string").flatMap((serverName) => {
+      const config = resolvedMcpServers?.get(serverName);
+      return config ? mcpServerTableLines(serverName, config) : [];
+    });
+  }
+  return [];
+}
+function serializeAgentToml(agentName, agent, resolvedMcpServers) {
   const lines = [];
   lines.push(`name = "${escapeTomlString2(agentName)}"`);
   const description = agent["description"];
   if (typeof description === "string") {
     lines.push(`description = "${escapeTomlString2(description)}"`);
   }
-  const content = agent["content"];
-  if (content !== null && typeof content === "object" && content.type === "TextContent") {
-    const textContent = content.value ?? "";
-    lines.push(`developer_instructions = ${serializeTomlValue(textContent)}`);
-  } else if (typeof content === "string") {
-    lines.push(`developer_instructions = ${serializeTomlValue(content)}`);
-  }
+  lines.push(...agentInstructionsLines(agent["content"]));
   const model = agent["model"];
   if (typeof model === "string") {
     lines.push(`model = "${escapeTomlString2(model)}"`);
@@ -27071,30 +27794,14 @@ function serializeAgentToml(agentName, agent) {
     const escaped = nicknameCandidates.filter((c) => typeof c === "string").map((c) => `"${escapeTomlString2(c)}"`);
     lines.push(`nickname_candidates = [${escaped.join(", ")}]`);
   }
-  const mcpServers = agent["mcpServers"];
-  if (mcpServers !== null && typeof mcpServers === "object" && !Array.isArray(mcpServers)) {
-    const servers = mcpServers;
-    const serverEntries = Object.entries(servers);
-    if (serverEntries.length > 0) {
-      lines.push("");
-      lines.push("[mcp_servers]");
-      for (const [serverName, serverConfig] of serverEntries) {
-        if (serverConfig !== null && typeof serverConfig === "object") {
-          lines.push(`[mcp_servers.${serverName}]`);
-          const config = serverConfig;
-          for (const [key, val] of Object.entries(config)) {
-            lines.push(`${key} = ${serializeTomlValue(val)}`);
-          }
-        }
-      }
-    }
+  const serverTables = agentMcpServerLines(agent["mcpServers"], resolvedMcpServers);
+  if (serverTables.length > 0) {
+    lines.push("", "[mcp_servers]", ...serverTables);
   }
   const skills2 = agent["skills"];
   if (Array.isArray(skills2)) {
     const skillNames = skills2.filter((s) => typeof s === "string").map((s) => `"${escapeTomlString2(s)}"`);
-    lines.push("");
-    lines.push("[skills]");
-    lines.push(`config = [${skillNames.join(", ")}]`);
+    lines.push("", "[skills]", `config = [${skillNames.join(", ")}]`);
   }
   return lines.join("\n") + "\n";
 }
@@ -27111,6 +27818,7 @@ var init_codex = __esm({
     init_markdown_instruction_formatter();
     init_hook_adapters();
     init_hook_capability_warnings();
+    init_agent_capability_warnings();
     init_mcp_helpers();
     init_plugin_helpers();
     CODEX_VERSIONS = {
@@ -27209,12 +27917,13 @@ var init_codex = __esm({
       format(ast, options) {
         const version = this.resolveVersion(options?.version);
         if (version === "simple") {
-          const output = appendTargetHookCapabilityWarnings(
+          let output = appendTargetHookCapabilityWarnings(
             this.formatSimple(ast, options),
             ast,
             this.name,
             version
           );
+          output = appendAgentCapabilityWarnings(output, ast, this.name, version);
           return {
             ...output,
             managedOutputFiles: [
@@ -27267,16 +27976,17 @@ var init_codex = __esm({
           if (!managedDirs.includes(".codex")) managedDirs.push(".codex");
         }
         const mcpServersBlock = findMcpServersBlock(ast);
-        if (mcpServersBlock) {
-          const servers = extractMcpServers(mcpServersBlock);
-          if (servers.length > 0) {
-            extraFiles.push({
-              path: ".codex/mcp.json",
-              content: serializeMcpServersToJsonString(servers)
-            });
-            managedDirs.push(".codex");
-          }
+        const definedMcpServers = mcpServersBlock ? extractMcpServers(mcpServersBlock) : [];
+        if (definedMcpServers.length > 0) {
+          extraFiles.push({
+            path: ".codex/mcp.json",
+            content: serializeMcpServersToJsonString(definedMcpServers)
+          });
+          managedDirs.push(".codex");
         }
+        const resolvedMcpServers = new Map(
+          definedMcpServers.map((server) => [server.name, mcpServerTomlConfig(server)])
+        );
         const pluginsBlock = findPluginsBlock(ast);
         if (pluginsBlock) {
           const plugins = extractPlugins(pluginsBlock);
@@ -27297,7 +28007,7 @@ var init_codex = __esm({
             if (!isValidAgentName(agentName)) continue;
             const agent = agentValue;
             const nativeAgentName = nativeNames.get(agentName) ?? agentName;
-            const toml = serializeAgentToml(nativeAgentName, agent);
+            const toml = serializeAgentToml(nativeAgentName, agent, resolvedMcpServers);
             extraFiles.push({
               path: `.codex/agents/${nativeAgentName}.toml`,
               content: toml
@@ -28051,6 +28761,7 @@ var init_grok = __esm({
     init_plugin_helpers();
     init_hook_adapters();
     init_hook_capability_warnings();
+    init_agent_capability_warnings();
     GROK_VERSIONS = {
       simple: {
         name: "simple",
@@ -28097,6 +28808,7 @@ var init_grok = __esm({
           output = this.formatFull(ast, options);
         }
         output = appendTargetHookCapabilityWarnings(output, ast, this.name, version);
+        output = appendAgentCapabilityWarnings(output, ast, this.name, version);
         return {
           ...output,
           managedOutputFiles: [
@@ -28264,6 +28976,25 @@ var init_hermes = __esm({
   }
 });
 
+// packages/formatters/src/formatters/gitlab-duo.ts
+var GitlabDuoFormatter, GITLAB_DUO_VERSIONS;
+var init_gitlab_duo = __esm({
+  "packages/formatters/src/formatters/gitlab-duo.ts"() {
+    "use strict";
+    init_create_simple_formatter();
+    ({ Formatter: GitlabDuoFormatter, VERSIONS: GITLAB_DUO_VERSIONS } = createSimpleMarkdownFormatter({
+      name: "gitlab-duo",
+      outputPath: "AGENTS.md",
+      description: "GitLab Duo instructions (Markdown)",
+      mainFileHeader: "# AGENTS.md",
+      dotDir: ".gitlab-duo",
+      hasSkills: true,
+      skillsInMultifile: false,
+      skillsDir: "skills"
+    }));
+  }
+});
+
 // packages/formatters/src/formatters/index.ts
 var init_formatters = __esm({
   "packages/formatters/src/formatters/index.ts"() {
@@ -28317,6 +29048,7 @@ var init_formatters = __esm({
     init_deep_agents();
     init_forgecode();
     init_hermes();
+    init_gitlab_duo();
   }
 });
 
@@ -28374,6 +29106,7 @@ var init_builtin_formatters = __esm({
     init_deep_agents();
     init_forgecode();
     init_hermes();
+    init_gitlab_duo();
     BUILTIN_FORMATTERS = {
       // Original 7
       github: GitHubFormatter,
@@ -28429,7 +29162,9 @@ var init_builtin_formatters = __esm({
       mimo: MimoFormatter,
       "deep-agents": DeepAgentsFormatter,
       forgecode: ForgecodeFormatter,
-      hermes: HermesFormatter
+      hermes: HermesFormatter,
+      // GitLab Duo (Agent Platform)
+      "gitlab-duo": GitlabDuoFormatter
     };
   }
 });
@@ -30738,6 +31473,7 @@ function userConfigToProjectRegistry(userRegistry) {
       ...userRegistry.git.fallbackUrl ? { fallbackUrl: userRegistry.git.fallbackUrl } : {},
       ...userRegistry.git.ref ? { ref: userRegistry.git.ref } : {},
       ...userRegistry.git.path ? { path: userRegistry.git.path } : {},
+      ...userRegistry.git.timeout !== void 0 ? { timeout: userRegistry.git.timeout } : {},
       ...userRegistry.git.auth ? { auth: userRegistry.git.auth } : {}
     };
   }
@@ -31252,6 +31988,7 @@ async function runInitCommand(options, services) {
       });
     }
     let migrationPrompt;
+    let migrationPromptCopied = false;
     if (migrationMode === "llm") {
       migrationPrompt = prepareLlmMigration(aiToolsDetection.migrationCandidates, options);
       writes.push({ path: ".promptscript/migration-prompt.md", content: migrationPrompt });
@@ -31286,7 +32023,7 @@ async function runInitCommand(options, services) {
       return;
     }
     if (migrationPrompt) {
-      deliverMigrationPrompt(migrationPrompt);
+      migrationPromptCopied = deliverMigrationPrompt(migrationPrompt);
     }
     const installedHookTargets = [];
     if (options.hooks !== false) {
@@ -31353,13 +32090,17 @@ async function runInitCommand(options, services) {
     ConsoleOutput.newline();
     ConsoleOutput.stats("Next steps:");
     if (migrationMode === "llm") {
-      ConsoleOutput.muted("1. Use the migration skill in your AI tool:");
-      const skillInvocations = getSkillInvocationHints(config.targets);
-      for (const hint of skillInvocations) {
-        ConsoleOutput.muted(`   ${hint}`);
+      ConsoleOutput.info("1. Start your AI agent in this project");
+      if (migrationPromptCopied) {
+        ConsoleOutput.info("2. Paste the migration prompt - it is already in your clipboard");
+      } else {
+        ConsoleOutput.info(
+          "2. Copy the migration prompt from the terminal output and paste it into your agent"
+        );
       }
-      ConsoleOutput.muted("2. Review generated .promptscript/project.prs");
-      ConsoleOutput.muted("3. Run: prs compile");
+      ConsoleOutput.info("3. Let the agent migrate your instructions");
+      ConsoleOutput.info("4. Review the generated files, then run: prs validate --strict");
+      ConsoleOutput.info("5. Run: prs compile");
     } else if (migrationMode === "static") {
       ConsoleOutput.muted("1. Review imported .promptscript/ files");
       ConsoleOutput.muted("2. Run: prs validate --strict");
@@ -31499,6 +32240,7 @@ function deliverMigrationPrompt(prompt) {
     console.log(prompt);
   }
   ConsoleOutput.info("Saved to .promptscript/migration-prompt.md");
+  return copied;
 }
 function getSkillWrites(targets) {
   const writes = [];
@@ -31841,16 +32583,6 @@ function getTargetSkillDir(target, skillName) {
   const dir = `${basePath}/${skillName}`;
   return { dir, path: `${dir}/${fileName}` };
 }
-function getSkillInvocationHints(targets) {
-  const hints = [];
-  for (const target of targets) {
-    const formatter = FormatterRegistry.get(target);
-    if (formatter && formatter.getSkillBasePath()) {
-      hints.push(`${formatter.description}: /promptscript`);
-    }
-  }
-  return hints;
-}
 function generateConfig(config) {
   const syntaxVersion = getLatestSyntaxVersion();
   const output = {
@@ -35272,9 +36004,9 @@ var require_rate_limit = __commonJS({
         throw new Error("The configured rate-limit store does not implement a `read` method, which is required to use `{ increment: false }`");
       }
       try {
-        const res = await new Promise((resolve42, reject) => {
+        const res = await new Promise((resolve43, reject) => {
           store[storeMethod](key, (err, res2) => {
-            err ? reject(err) : resolve42(res2);
+            err ? reject(err) : resolve43(res2);
           }, timeWindow, max);
         });
         current = res.current;
@@ -35444,16 +36176,16 @@ var init_config2 = __esm({
 });
 
 // packages/server/src/path-guard.ts
-import { resolve as resolve40, relative as relative19, isAbsolute as isAbsolute17, dirname as dirname25, basename as basename19 } from "path";
+import { resolve as resolve41, relative as relative21, isAbsolute as isAbsolute19, dirname as dirname25, basename as basename19 } from "path";
 import { realpath as realpath6 } from "fs/promises";
 async function resolveSafePath(workspace, requestedPath) {
   const decoded = decodeURIComponent(requestedPath);
-  if (isAbsolute17(decoded)) {
+  if (isAbsolute19(decoded)) {
     throw new PathTraversalError(requestedPath);
   }
-  const resolved = resolve40(workspace, decoded);
-  const rel = relative19(workspace, resolved);
-  if (rel.startsWith("..") || isAbsolute17(rel)) {
+  const resolved = resolve41(workspace, decoded);
+  const rel = relative21(workspace, resolved);
+  if (rel.startsWith("..") || isAbsolute19(rel)) {
     throw new PathTraversalError(requestedPath);
   }
   let realWorkspace;
@@ -35469,7 +36201,7 @@ async function resolveSafePath(workspace, requestedPath) {
     if (err instanceof Error && "code" in err && err.code === "ENOENT") {
       try {
         const realParent = await realpath6(dirname25(resolved));
-        real = resolve40(realParent, basename19(resolved));
+        real = resolve41(realParent, basename19(resolved));
       } catch {
         return resolved;
       }
@@ -35477,8 +36209,8 @@ async function resolveSafePath(workspace, requestedPath) {
       throw err;
     }
   }
-  const realRel = relative19(realWorkspace, real);
-  if (realRel.startsWith("..") || isAbsolute17(realRel)) {
+  const realRel = relative21(realWorkspace, real);
+  if (realRel.startsWith("..") || isAbsolute19(realRel)) {
     throw new PathTraversalError(requestedPath);
   }
   return resolved;
@@ -35497,7 +36229,7 @@ var init_path_guard = __esm({
 });
 
 // packages/server/src/routes/files.ts
-import { readFile as readFile32, writeFile as writeFile12, unlink as unlink3, stat as stat4, mkdir as mkdir11 } from "fs/promises";
+import { readFile as readFile32, writeFile as writeFile12, unlink as unlink3, stat as stat4, mkdir as mkdir12 } from "fs/promises";
 import { dirname as dirname26 } from "path";
 import fg from "fast-glob";
 function registerRoutes(app, workspace, readOnly) {
@@ -35558,7 +36290,7 @@ function registerRoutes(app, workspace, readOnly) {
           return reply.status(409).send({ error: "File already exists" });
         } catch {
         }
-        await mkdir11(dirname26(resolved), { recursive: true });
+        await mkdir12(dirname26(resolved), { recursive: true });
         await writeFile12(resolved, request.body.content, "utf-8");
         return reply.status(201).send({ path: filePath, status: "created" });
       } catch (err) {
@@ -35596,7 +36328,7 @@ var init_files = __esm({
 
 // packages/server/src/watcher.ts
 import { watch } from "chokidar";
-import { relative as relative20 } from "path";
+import { relative as relative22 } from "path";
 function isWatchedFile(filePath) {
   const base = filePath.split("/").pop() ?? "";
   if (CONFIG_FILENAMES2.has(base)) return true;
@@ -35612,15 +36344,15 @@ function createFileWatcher(workspace, watchPaths, onEvent) {
   });
   watcher.on("add", (filePath) => {
     if (!ready || !isWatchedFile(filePath)) return;
-    onEvent({ type: "file:created", path: relative20(workspace, filePath) });
+    onEvent({ type: "file:created", path: relative22(workspace, filePath) });
   });
   watcher.on("change", (filePath) => {
     if (!ready || !isWatchedFile(filePath)) return;
-    onEvent({ type: "file:changed", path: relative20(workspace, filePath) });
+    onEvent({ type: "file:changed", path: relative22(workspace, filePath) });
   });
   watcher.on("unlink", (filePath) => {
     if (!ready || !isWatchedFile(filePath)) return;
-    onEvent({ type: "file:deleted", path: relative20(workspace, filePath) });
+    onEvent({ type: "file:deleted", path: relative22(workspace, filePath) });
   });
   return watcher;
 }
@@ -35787,7 +36519,7 @@ var migrate_exports = {};
 __export(migrate_exports, {
   migrateCommand: () => migrateCommand
 });
-import { dirname as dirname27, relative as relative21, resolve as resolve41 } from "path";
+import { dirname as dirname27, relative as relative23, resolve as resolve42 } from "path";
 import { parse as parseYaml17 } from "yaml";
 async function migrateCommand(options, services = createDefaultServices()) {
   const previousOutputStream = getContext().outputStream;
@@ -36045,7 +36777,7 @@ function extractTargetNames(targets) {
 }
 async function createStaticMigrationWrites(candidates, config, entryPaths, services) {
   const result = await importMultipleFiles(
-    candidates.map((candidate) => resolve41(services.cwd, candidate.path)),
+    candidates.map((candidate) => resolve42(services.cwd, candidate.path)),
     {
       projectName: config.id,
       syntaxVersion: config.syntax || getLatestSyntaxVersion()
@@ -36079,7 +36811,7 @@ async function createStaticMigrationWrites(candidates, config, entryPaths, servi
   const migratedProjectPath = ".promptscript/migrated/project.prs";
   writes.push({ path: migratedProjectPath, content: markMigrationOutput(importedProject) });
   for (const entryPath of entryPaths) {
-    const useLine = `@use ${toUsePath(entryPath, migratedProjectPath)}`;
+    const useLine = `@use ${toUsePath2(entryPath, migratedProjectPath)}`;
     if (services.fs.existsSync(entryPath)) {
       const existing = await services.fs.readFile(entryPath, "utf-8");
       const hasUseLine = existing.split(/\r?\n/).some((line) => line.trim() === useLine);
@@ -36137,9 +36869,9 @@ function markMigrationOutput(content) {
   return `# promptscript-generated: migration
 ${content}`;
 }
-function toUsePath(entryPath, targetPath) {
+function toUsePath2(entryPath, targetPath) {
   const withoutExtension = targetPath.replace(/\.prs$/, "");
-  const path2 = relative21(dirname27(entryPath), withoutExtension).replace(/\\/g, "/");
+  const path2 = relative23(dirname27(entryPath), withoutExtension).replace(/\\/g, "/");
   return path2.startsWith("./") || path2.startsWith("../") ? path2 : `./${path2}`;
 }
 function validateProjectPath(path2) {
@@ -36204,12 +36936,13 @@ import { fileURLToPath as fileURLToPath4, pathToFileURL } from "url";
 import { dirname as dirname28 } from "path";
 
 // packages/cli/src/commands/compile.ts
-import { resolve as resolve21, isAbsolute as isAbsolute13, relative as relative14 } from "path";
-import { readFile as readFile16 } from "fs/promises";
-import { existsSync as existsSync14, lstatSync as lstatSync2 } from "fs";
+import { resolve as resolve22, isAbsolute as isAbsolute14, relative as relative15 } from "node:path";
+import { homedir as homedir4 } from "node:os";
+import { readFile as readFile16 } from "node:fs/promises";
+import { existsSync as existsSync14, lstatSync as lstatSync2 } from "node:fs";
 import chokidar from "chokidar";
 
-// node_modules/.pnpm/balanced-match@4.0.3/node_modules/balanced-match/dist/esm/index.js
+// node_modules/.pnpm/balanced-match@4.0.4/node_modules/balanced-match/dist/esm/index.js
 var balanced = (a, b, str) => {
   const ma = a instanceof RegExp ? maybeMatch(a, str) : a;
   const mb = b instanceof RegExp ? maybeMatch(b, str) : b;
@@ -38149,6 +38882,14 @@ function findFallbackUrl(repoUrl, registries) {
   }
   return void 0;
 }
+function findRegistryEntry(repoUrl, registries) {
+  for (const entry of Object.values(registries)) {
+    if (typeof entry !== "string" && entry.url === repoUrl) {
+      return entry;
+    }
+  }
+  return void 0;
+}
 
 // packages/resolver/src/loader.ts
 var REGISTRY_MARKER_PREFIX = "__registry__:";
@@ -39169,7 +39910,8 @@ function parseSkillMd(content, sourceFile = "<skill>") {
       sourceFile,
       frontmatter.location,
       yamlFrontmatter.fieldLocations,
-      yamlFrontmatter.fieldItemLocations
+      yamlFrontmatter.fieldItemLocations,
+      yamlFrontmatter.fieldValueLocations
     );
     const bodyContent = stripLeadingHtmlMarker(frontmatter.body).trim();
     const result = {
@@ -39294,11 +40036,11 @@ function parseYamlFrontmatter(frontmatter, sourceFile) {
   }
   rejectUnsafeYamlNodes(document.contents, sourceFile, frontmatter);
   enforceFrontmatterLimits(document.contents, sourceFile, frontmatter);
-  const { fields: fieldLocations, items: fieldItemLocations } = getTopLevelFieldLocations(
-    document.contents,
-    sourceFile,
-    frontmatter
-  );
+  const {
+    fields: fieldLocations,
+    items: fieldItemLocations,
+    values: fieldValueLocations
+  } = getTopLevelFieldLocations(document.contents, sourceFile, frontmatter);
   let value;
   try {
     value = document.toJS({ maxAliasCount: 0 });
@@ -39311,7 +40053,7 @@ function parseYamlFrontmatter(frontmatter, sourceFile) {
     );
   }
   if (document.contents === null) {
-    return { fields: {}, fieldLocations, fieldItemLocations };
+    return { fields: {}, fieldLocations, fieldItemLocations, fieldValueLocations };
   }
   if (!isRecord5(value)) {
     throw frontmatterError(
@@ -39320,7 +40062,7 @@ function parseYamlFrontmatter(frontmatter, sourceFile) {
       frontmatter.location
     );
   }
-  return { fields: value, fieldLocations, fieldItemLocations };
+  return { fields: value, fieldLocations, fieldItemLocations, fieldValueLocations };
 }
 function getYamlLocation(frontmatter, sourceFile, offset) {
   const source = frontmatter.raw;
@@ -39339,7 +40081,10 @@ function getYamlLocation(frontmatter, sourceFile, offset) {
 function getTopLevelFieldLocations(node, sourceFile, frontmatter) {
   const fieldLocations = /* @__PURE__ */ new Map();
   const fieldItemLocations = /* @__PURE__ */ new Map();
-  if (!isCollection(node)) return { fields: fieldLocations, items: fieldItemLocations };
+  const fieldValueLocations = /* @__PURE__ */ new Map();
+  if (!isCollection(node)) {
+    return { fields: fieldLocations, items: fieldItemLocations, values: fieldValueLocations };
+  }
   for (const item of node.items) {
     if (!isPair(item)) continue;
     const key = getScalarString(item.key);
@@ -39351,9 +40096,21 @@ function getTopLevelFieldLocations(node, sourceFile, frontmatter) {
         key,
         item.value.items.map((value) => getNodeLocation(value, sourceFile, frontmatter))
       );
+      fieldValueLocations.set(key, getNestedFieldLocations(item.value, sourceFile, frontmatter));
     }
   }
-  return { fields: fieldLocations, items: fieldItemLocations };
+  return { fields: fieldLocations, items: fieldItemLocations, values: fieldValueLocations };
+}
+function getNestedFieldLocations(collection, sourceFile, frontmatter) {
+  const valueLocations = /* @__PURE__ */ new Map();
+  if (!isCollection(collection)) return valueLocations;
+  for (const item of collection.items) {
+    if (!isPair(item)) continue;
+    const key = getScalarString(item.key);
+    if (key === void 0) continue;
+    valueLocations.set(key, getNodeLocation(item.value ?? item.key, sourceFile, frontmatter));
+  }
+  return valueLocations;
 }
 function getScalarString(node) {
   if (!isNode(node) || !("value" in node)) return void 0;
@@ -39468,7 +40225,7 @@ function frontmatterError(message, sourceFile, location) {
     file: sourceFile
   });
 }
-function parseFrontmatterFields(fields, sourceFile, fallbackLocation, fieldLocations, fieldItemLocations) {
+function parseFrontmatterFields(fields, sourceFile, fallbackLocation, fieldLocations, fieldItemLocations, fieldValueLocations) {
   const name = readOptionalString(
     fields,
     "name",
@@ -39526,7 +40283,8 @@ function parseFrontmatterFields(fields, sourceFile, fallbackLocation, fieldLocat
   const metadata = parseMetadataField(
     fields,
     sourceFile,
-    getFieldLocation("metadata", fieldLocations, fallbackLocation)
+    getFieldLocation("metadata", fieldLocations, fallbackLocation),
+    fieldValueLocations.get("metadata")
   );
   const allowedTools = parseAllowedToolsField(
     fields,
@@ -39789,7 +40547,7 @@ function readOptionalStringFromRecord(record, field, context, sourceFile, locati
   }
   return value;
 }
-function parseMetadataField(fields, sourceFile, location) {
+function parseMetadataField(fields, sourceFile, location, valueLocations) {
   if (!Object.hasOwn(fields, "metadata")) return void 0;
   const value = fields["metadata"];
   if (!isRecord5(value)) {
@@ -39798,7 +40556,11 @@ function parseMetadataField(fields, sourceFile, location) {
   const metadata = createSafeRecord();
   for (const [key, item] of Object.entries(value)) {
     if (typeof item !== "string") {
-      throw frontmatterError(`metadata value "${key}" must be a string`, sourceFile, location);
+      throw frontmatterError(
+        `metadata value "${key}" must be a string; quote scalar values (for example, 16 as "16")`,
+        sourceFile,
+        valueLocations?.get(key) ?? location
+      );
     }
     metadata[key] = item;
   }
@@ -40977,26 +41739,29 @@ var VIRTUAL_LOC = {
   column: 1,
   offset: 0
 };
-function makeObjectContent(properties) {
+function fileLoc(file) {
+  return { file, line: 1, column: 1, offset: 0 };
+}
+function makeObjectContent(properties, file) {
   return {
     type: "ObjectContent",
     properties,
-    loc: VIRTUAL_LOC
+    loc: file ? fileLoc(file) : VIRTUAL_LOC
   };
 }
 function makeTextContent(value, file) {
   return {
     type: "TextContent",
     value,
-    loc: file ? { file, line: 1, column: 1, offset: 0 } : VIRTUAL_LOC
+    loc: file ? fileLoc(file) : VIRTUAL_LOC
   };
 }
-function makeBlock(name, content) {
+function makeBlock(name, content, file) {
   return {
     type: "Block",
     name,
     content,
-    loc: VIRTUAL_LOC
+    loc: file ? fileLoc(file) : VIRTUAL_LOC
   };
 }
 
@@ -41848,9 +42613,29 @@ var GitCacheManager = class {
 // packages/resolver/src/git-registry.ts
 var TAGS_CACHE_TTL_MS = 24 * 60 * 60 * 1e3;
 var DEFAULT_GIT_TIMEOUT_MS = 6e4;
+var GIT_TIMEOUT_ENV_VAR = "PROMPTSCRIPT_GIT_TIMEOUT";
 var SEMVER_TAG_RE = /^v?\d+\.\d+\.\d+/;
+function envGitTimeout() {
+  const raw = process.env[GIT_TIMEOUT_ENV_VAR];
+  if (raw === void 0 || raw.trim() === "") {
+    return void 0;
+  }
+  const parsed = Number(raw);
+  return Number.isFinite(parsed) && parsed > 0 ? parsed : void 0;
+}
 function normalizeGitTimeout(timeout) {
-  return timeout !== void 0 && Number.isFinite(timeout) && timeout > 0 ? timeout : DEFAULT_GIT_TIMEOUT_MS;
+  if (timeout !== void 0 && Number.isFinite(timeout) && timeout > 0) {
+    return timeout;
+  }
+  const fromEnv = envGitTimeout();
+  if (fromEnv !== void 0) {
+    return fromEnv;
+  }
+  return DEFAULT_GIT_TIMEOUT_MS;
+}
+function isPartialCloneUnsupported(error) {
+  const message = error.message.toLowerCase();
+  return message.includes("filtering not recognized") || message.includes("does not support filtering") || message.includes("invalid filter") || message.includes("filter is not supported") || /unknown (option|switch)[`' ]*(sparse|filter)/.test(message);
 }
 var GitCloneError = class extends Error {
   constructor(message, url, cause) {
@@ -42082,17 +42867,20 @@ var GitRegistry = class {
    * @param tag - Git tag to check out, or undefined for the default branch
    * @param targetDir - Directory to clone into
    * @param fallbackRepoUrl - Optional fallback URL to try on auth failure
+   * @param sparsePath - Optional subdirectory to limit the checkout to.
+   *   Uses `--filter=blob:none --sparse` + `sparse-checkout` so only the
+   *   blobs for that subdirectory are fetched. Falls back to a plain
+   *   shallow clone when the server does not support partial clones.
    */
-  async cloneAtTag(repoUrl, tag, targetDir, fallbackRepoUrl) {
+  async cloneAtTag(repoUrl, tag, targetDir, fallbackRepoUrl, sparsePath) {
     if (existsSync8(targetDir)) {
       await fs2.rm(targetDir, { recursive: true, force: true });
     }
     await fs2.mkdir(targetDir, { recursive: true });
     const git = this.createGit();
-    const cloneOptions = tag ? ["--depth=1", `--branch=${tag}`, "--single-branch"] : ["--depth=1"];
     const cloneUrl = this.auth ? this.transportUrl : repoUrl;
     try {
-      await git.clone(cloneUrl, targetDir, cloneOptions);
+      await this.performClone(git, cloneUrl, targetDir, tag, sparsePath);
     } catch (err) {
       const error = err instanceof Error ? err : new Error(String(err));
       if (isGitTimeoutError(error)) {
@@ -42104,24 +42892,15 @@ var GitRegistry = class {
       if (this.isAccessError(error)) {
         if (fallbackRepoUrl) {
           try {
-            await git.clone(fallbackRepoUrl, targetDir, cloneOptions);
+            await this.performClone(git, fallbackRepoUrl, targetDir, tag, sparsePath);
             return;
           } catch (fallbackErr) {
-            const fbError = fallbackErr instanceof Error ? fallbackErr : new Error(String(fallbackErr));
-            if (isGitTimeoutError(fbError)) {
-              throw createGitTimeoutError(fallbackRepoUrl, this.timeout, fbError);
-            }
-            if (this.isAccessError(fbError)) {
-              throw new GitAuthError(
-                `Authentication failed for both ${repoUrl} and fallback ${fallbackRepoUrl}`,
-                fallbackRepoUrl,
-                fbError
-              );
-            }
-            throw new GitCloneError(
-              `Failed to clone ${fallbackRepoUrl} at ${tag ?? "default branch"}: ${fbError.message}`,
+            throw this.classifyFallbackCloneError(
+              repoUrl,
               fallbackRepoUrl,
-              fbError
+              fallbackErr,
+              tag,
+              "clone"
             );
           }
         }
@@ -42134,6 +42913,92 @@ var GitRegistry = class {
       );
     }
   }
+  /**
+   * Clone shallow, optionally partial (`--filter=blob:none --sparse`) with a
+   * sparse-checkout cone of `sparsePath`. Retries without the partial-clone
+   * flags when the server or local Git does not support them.
+   */
+  async performClone(git, url, targetDir, tag, sparsePath) {
+    const tagOptions = tag ? ["--branch=" + tag, "--single-branch"] : [];
+    const baseOptions = ["--depth=1", ...tagOptions];
+    if (!sparsePath) {
+      await git.clone(url, targetDir, baseOptions);
+      return;
+    }
+    try {
+      await git.clone(url, targetDir, [...baseOptions, "--filter=blob:none", "--sparse"]);
+    } catch (err) {
+      const error = err instanceof Error ? err : new Error(String(err));
+      if (!isPartialCloneUnsupported(error)) {
+        throw error;
+      }
+      if (existsSync8(targetDir)) {
+        await fs2.rm(targetDir, { recursive: true, force: true });
+      }
+      await fs2.mkdir(targetDir, { recursive: true });
+      await git.clone(url, targetDir, baseOptions);
+      return;
+    }
+    const repoGit = this.createGit(targetDir);
+    await repoGit.raw(["sparse-checkout", "set", sparsePath]);
+  }
+  /**
+   * Check whether the checkout at `targetDir` uses sparse-checkout.
+   */
+  async isSparseCheckout(targetDir) {
+    const git = this.createGit(targetDir);
+    try {
+      const out = await git.raw(["config", "core.sparseCheckout"]);
+      return out.trim() === "true";
+    } catch {
+      return false;
+    }
+  }
+  /**
+   * Disable sparse-checkout, materializing the full working tree.
+   * Used when a root-level import needs the whole repository but the
+   * cached clone is partial.
+   */
+  async disableSparseCheckout(targetDir) {
+    try {
+      await this.createGit(targetDir).raw(["sparse-checkout", "disable"]);
+    } catch (err) {
+      this.throwIfGitTimeout(err);
+      throw err instanceof Error ? err : new Error(String(err));
+    }
+  }
+  /** Convert a raw Git error into a GitCloneError when it is a timeout. */
+  throwIfGitTimeout(err) {
+    const error = err instanceof Error ? err : new Error(String(err));
+    if (isGitTimeoutError(error)) {
+      throw createGitTimeoutError(this.url, this.timeout, error);
+    }
+  }
+  /**
+   * Add paths to an existing sparse checkout so their blobs are fetched
+   * on demand. Used when a cached partial clone needs a subdirectory that
+   * the original cone did not cover.
+   */
+  async addSparsePaths(targetDir, paths) {
+    const extra = paths.filter((p) => p.length > 0 && p !== ".");
+    if (extra.length === 0) {
+      return;
+    }
+    const git = this.createGit(targetDir);
+    try {
+      await git.raw(["sparse-checkout", "add", ...extra]);
+    } catch (addError) {
+      const original = addError instanceof Error ? addError : new Error(String(addError));
+      try {
+        const listed = await git.raw(["sparse-checkout", "list"]);
+        const current = listed.split("\n").map((line) => line.trim()).filter(Boolean);
+        await git.raw(["sparse-checkout", "set", .../* @__PURE__ */ new Set([...current, ...extra])]);
+      } catch (setErr) {
+        this.throwIfGitTimeout(setErr);
+        throw original;
+      }
+    }
+  }
   /**
    * List all semver tags from a remote repo.
    * Results are cached via RegistryCache to avoid repeated ls-remote calls.
@@ -42199,8 +43064,9 @@ var GitRegistry = class {
     }
     await fs2.mkdir(targetDir, { recursive: true });
     const git = this.createGit();
+    const cloneUrl = this.auth ? this.transportUrl : repoUrl;
     try {
-      await this.doCloneSparse(git, repoUrl, ref, targetDir, sparsePath);
+      await this.performClone(git, cloneUrl, targetDir, ref, sparsePath);
     } catch (err) {
       const error = err instanceof Error ? err : new Error(String(err));
       if (isGitTimeoutError(error)) {
@@ -42208,24 +43074,15 @@ var GitRegistry = class {
       }
       if (this.isAccessError(error) && fallbackRepoUrl) {
         try {
-          await this.doCloneSparse(git, fallbackRepoUrl, ref, targetDir, sparsePath);
+          await this.performClone(git, fallbackRepoUrl, targetDir, ref, sparsePath);
           return;
         } catch (fallbackErr) {
-          const fbError = fallbackErr instanceof Error ? fallbackErr : new Error(String(fallbackErr));
-          if (isGitTimeoutError(fbError)) {
-            throw createGitTimeoutError(fallbackRepoUrl, this.timeout, fbError);
-          }
-          if (this.isAccessError(fbError)) {
-            throw new GitAuthError(
-              `Authentication failed for both ${repoUrl} and fallback ${fallbackRepoUrl}`,
-              fallbackRepoUrl,
-              fbError
-            );
-          }
-          throw new GitCloneError(
-            `Failed to sparse-clone ${fallbackRepoUrl} at ${ref}: ${fbError.message}`,
+          throw this.classifyFallbackCloneError(
+            repoUrl,
             fallbackRepoUrl,
-            fbError
+            fallbackErr,
+            ref,
+            "sparse-clone"
           );
         }
       }
@@ -42243,22 +43100,26 @@ var GitRegistry = class {
     }
   }
   /**
-   * Internal sparse-clone implementation (no fallback logic).
+   * Classify an error from the fallback clone attempt shared by
+   * `cloneAtTag` and `cloneSparse`: timeout, auth, or a plain clone failure.
    */
-  async doCloneSparse(git, repoUrl, ref, targetDir, sparsePath) {
-    if (existsSync8(targetDir)) {
-      await fs2.rm(targetDir, { recursive: true, force: true });
+  classifyFallbackCloneError(repoUrl, fallbackRepoUrl, err, ref, action) {
+    const fbError = err instanceof Error ? err : new Error(String(err));
+    if (isGitTimeoutError(fbError)) {
+      return createGitTimeoutError(fallbackRepoUrl, this.timeout, fbError);
+    }
+    if (this.isAccessError(fbError)) {
+      return new GitAuthError(
+        `Authentication failed for both ${repoUrl} and fallback ${fallbackRepoUrl}`,
+        fallbackRepoUrl,
+        fbError
+      );
     }
-    await fs2.mkdir(targetDir, { recursive: true });
-    await git.clone(repoUrl, targetDir, [
-      "--depth=1",
-      `--branch=${ref}`,
-      "--single-branch",
-      "--filter=blob:none",
-      "--sparse"
-    ]);
-    const repoGit = this.createGit(targetDir);
-    await repoGit.raw(["sparse-checkout", "set", sparsePath]);
+    return new GitCloneError(
+      `Failed to ${action} ${fallbackRepoUrl} at ${ref ?? "default branch"}: ${fbError.message}`,
+      fallbackRepoUrl,
+      fbError
+    );
   }
   /**
    * Ensure the repository is cloned and at the correct ref.
@@ -42657,7 +43518,7 @@ function createGitTimeoutError(url, timeout, cause) {
     return cause;
   }
   return new GitCloneError(
-    `Git operation timed out after ${timeout}ms while contacting ${url}`,
+    `Git operation timed out after ${timeout}ms while contacting ${url}. Raise the limit with the 'timeout' field on the registry entry or the ${GIT_TIMEOUT_ENV_VAR} environment variable.`,
     url,
     cause
   );
@@ -43069,7 +43930,7 @@ async function discoverNativeContent(dir, logger) {
     }
   }
   if (Object.keys(mergedSkills).length > 0) {
-    blocks.push(makeBlock("skills", makeObjectContent(mergedSkills)));
+    blocks.push(makeBlock("skills", makeObjectContent(mergedSkills, dir), dir));
   }
   const rootAgents = await discoverAgents(dir) ?? {};
   const wrappedAgents = {};
@@ -43082,7 +43943,7 @@ async function discoverNativeContent(dir, logger) {
   }
   const mergedAgents = { ...wrappedAgents, ...rootAgents };
   if (Object.keys(mergedAgents).length > 0) {
-    blocks.push(makeBlock("agents", makeObjectContent(mergedAgents)));
+    blocks.push(makeBlock("agents", makeObjectContent(mergedAgents, dir), dir));
   }
   const rootCommands = await discoverCommands(dir) ?? {};
   const wrappedCommands = {};
@@ -43095,11 +43956,11 @@ async function discoverNativeContent(dir, logger) {
   }
   const mergedCommands = { ...wrappedCommands, ...rootCommands };
   if (Object.keys(mergedCommands).length > 0) {
-    blocks.push(makeBlock("shortcuts", makeObjectContent(mergedCommands)));
+    blocks.push(makeBlock("shortcuts", makeObjectContent(mergedCommands, dir), dir));
   }
   const contextContent = await discoverContext(dir);
   if (contextContent) {
-    blocks.push(makeBlock("context", contextContent));
+    blocks.push(makeBlock("context", contextContent, contextContent.loc.file));
   }
   if (blocks.length === 0) {
     return null;
@@ -43109,7 +43970,7 @@ async function discoverNativeContent(dir, logger) {
     blocks,
     uses: [],
     extends: [],
-    loc: VIRTUAL_LOC
+    loc: fileLoc(dir)
   };
   return program2;
 }
@@ -43156,6 +44017,37 @@ async function readBoundedRegularFile(filePath, maxBytes, description) {
     await handle.close();
   }
 }
+async function readOptionalBoundedRegularFile(filePath, description) {
+  try {
+    return await readBoundedRegularFile(filePath, MAX_GIT_CONFIG_BYTES, description);
+  } catch (error) {
+    if (typeof error === "object" && error !== null && "code" in error && error.code === "ENOENT") {
+      return Buffer.alloc(0);
+    }
+    throw error;
+  }
+}
+async function readGitBooleanConfig(filePath, key, description) {
+  try {
+    const result = await execFileAsync(
+      "git",
+      ["config", "--no-includes", "--file", filePath, "--bool", "--get", key],
+      {
+        env: {
+          PATH: process.env["PATH"],
+          GIT_CONFIG_GLOBAL: NULL_DEVICE,
+          GIT_CONFIG_NOSYSTEM: "1"
+        }
+      }
+    );
+    return result.stdout.trim() === "true";
+  } catch (error) {
+    if (typeof error === "object" && error !== null && "code" in error && error.code === 1) {
+      return false;
+    }
+    throw new Error(`Invalid ${description}: ${filePath}`, { cause: error });
+  }
+}
 async function resolveSafeRepositorySymlink(symlinkPath, repositoryRoot, gitMetadataRoot) {
   let targetPath;
   try {
@@ -43249,7 +44141,7 @@ async function hashVendorRepository(directory) {
   await visit(directory, "");
   return `sha256-${hash.digest("hex")}`;
 }
-async function verifyGitRepositoryCheckout(directory, gitDirectoryName, expectedCommit, allowedUntrackedFiles = /* @__PURE__ */ new Set()) {
+async function verifyGitRepositoryCheckout(directory, gitDirectoryName, expectedCommit, allowedUntrackedFiles = /* @__PURE__ */ new Set(), options = {}) {
   const gitDir = join9(directory, gitDirectoryName);
   async function rejectMetadataSymlinks(currentDirectory) {
     for (const entry of await readdir4(currentDirectory, { withFileTypes: true })) {
@@ -43287,8 +44179,23 @@ async function verifyGitRepositoryCheckout(directory, gitDirectoryName, expected
     "Vendor Git config"
   );
   const localConfig = localConfigContent.toString("utf-8");
-  if (/^[ \t]*\[(?:include|includeif)\b/im.test(localConfig) || /\bpromisor\s*=\s*true\b/i.test(localConfig) || /\bpartialclone/i.test(localConfig) || /\bworktreeconfig\s*=\s*true\b/i.test(localConfig)) {
-    throw new Error(`External or partial Git object sources are not allowed: ${gitDir}`);
+  const externalGitSourcesError = () => `External or partial Git object sources are not allowed: ${gitDir}. ` + (options.allowPartial ? `Delete the checkout directory ${directory} and re-run this command to re-clone it.` : `Run 'prs vendor sync' to re-vendor the dependency, then re-run this command.`);
+  if (/^[ \t]*\[(?:include|includeif)\b/im.test(localConfig)) {
+    throw new Error(externalGitSourcesError());
+  }
+  const usesWorktreeConfig = await readGitBooleanConfig(
+    join9(gitDir, "config"),
+    "extensions.worktreeConfig",
+    "Git worktree config extension"
+  );
+  if (!options.allowPartial && (usesWorktreeConfig || /\bpromisor\s*=\s*true\b/i.test(localConfig) || /\bpartialclone/i.test(localConfig))) {
+    throw new Error(externalGitSourcesError());
+  }
+  if (options.allowPartial && usesWorktreeConfig) {
+    const worktreeConfig = (await readOptionalBoundedRegularFile(join9(gitDir, "config.worktree"), "Git worktree config")).toString("utf-8");
+    if (/^[ \t]*\[(?:include|includeif)\b/im.test(worktreeConfig)) {
+      throw new Error(externalGitSourcesError());
+    }
   }
   await rejectMetadataPath("commondir", "Git common directories are not allowed");
   await rejectMetadataPath(
@@ -43458,7 +44365,7 @@ async function verifyGitRepositoryCheckout(directory, gitDirectoryName, expected
     }
   }
   await collectFiles(directory, "");
-  if (worktreeFileCount !== trackedFiles.size || regularFiles.some((path2) => !trackedFiles.has(path2))) {
+  if (!options.allowPartial && worktreeFileCount !== trackedFiles.size || regularFiles.some((path2) => !trackedFiles.has(path2))) {
     throw new Error(`Vendored repository contents do not match commit ${expectedCommit}`);
   }
   const batchSize = 100;
@@ -43742,7 +44649,8 @@ var Resolver = class {
   cacheEnabled;
   logger;
   options;
-  gitRegistry;
+  /** Lazy per-repository Git registries (carry per-entry timeout settings). */
+  gitRegistries = /* @__PURE__ */ new Map();
   registryCache;
   constructor(options) {
     this.options = options;
@@ -43750,7 +44658,6 @@ var Resolver = class {
     this.cache = /* @__PURE__ */ new Map();
     this.cacheEnabled = options.cache !== false;
     this.logger = options.logger ?? noopLogger;
-    this.gitRegistry = new GitRegistry({ url: "https://github.com/placeholder/placeholder.git" });
     const defaultCacheDir = join10(
       process.env["HOME"] ?? process.env["USERPROFILE"] ?? "/tmp",
       ".promptscript",
@@ -43758,6 +44665,54 @@ var Resolver = class {
     );
     this.registryCache = new RegistryCache(options.cacheDir ?? defaultCacheDir);
   }
+  /**
+   * Get (or lazily create) the Git registry for a repository URL.
+   *
+   * Per-repository instances carry the `timeout` from the matching
+   * registries config entry, so large monorepo registries can raise the
+   * clone timeout per entry (see issue #455). Falls back to
+   * PROMPTSCRIPT_GIT_TIMEOUT / the 60s default inside GitRegistry.
+   */
+  getGitRegistry(repoUrl) {
+    const cached = this.gitRegistries.get(repoUrl);
+    if (cached) {
+      return cached;
+    }
+    const entry = this.options.registries ? findRegistryEntry(repoUrl, this.options.registries) : void 0;
+    const registry2 = new GitRegistry({
+      url: repoUrl,
+      ...entry?.timeout !== void 0 ? { timeout: entry.timeout } : {}
+    });
+    this.gitRegistries.set(repoUrl, registry2);
+    return registry2;
+  }
+  /**
+   * Clone a registry repository into its cache path. Uses the per-entry
+   * Git registry (so the configured timeout applies) and the fallback URL
+   * from the lockfile or the registries config.
+   */
+  async cloneRegistryIntoCache(repoUrl, cachePath, tag, sparseCone, lockEntry) {
+    const gitRegistry = this.getGitRegistry(repoUrl);
+    const fallbackRepoUrl = lockEntry?.gitUrl ?? (this.options.registries ? findFallbackUrl(repoUrl, this.options.registries) : void 0);
+    await gitRegistry.cloneAtTag(repoUrl, tag, cachePath, fallbackRepoUrl, sparseCone);
+    return gitRegistry;
+  }
+  /**
+   * Verify that a cached registry checkout matches a locked commit.
+   * Cache clones may be partial (sparse cones), so partial-clone metadata
+   * and missing out-of-cone files are allowed.
+   */
+  async verifyCacheCommit(cachePath, commit) {
+    await verifyGitRepositoryCheckout(
+      cachePath,
+      ".git",
+      commit,
+      /* @__PURE__ */ new Set([".prs-registry-meta.json"]),
+      {
+        allowPartial: true
+      }
+    );
+  }
   /**
    * Resolve a PromptScript file and all its dependencies.
    *
@@ -44368,10 +45323,12 @@ var Resolver = class {
     }
     const program2 = {
       type: "Program",
-      blocks: [makeBlock("skills", makeObjectContent({ [skillName]: skillProps }))],
+      blocks: [
+        makeBlock("skills", makeObjectContent({ [skillName]: skillProps }, absPath), absPath)
+      ],
       uses: [],
       extends: [],
-      loc: VIRTUAL_LOC
+      loc: fileLoc(absPath)
     };
     return { ast: program2 };
   }
@@ -44446,7 +45403,8 @@ var Resolver = class {
       }
       errors.push(
         new ResolveError(
-          `Failed to resolve parent: ${err instanceof Error ? err.message : String(err)}`
+          `Failed to resolve parent: ${err instanceof Error ? err.message : String(err)}`,
+          err instanceof ResolveError ? err.location : void 0
         )
       );
     }
@@ -44545,7 +45503,8 @@ var Resolver = class {
         }
         errors.push(
           new ResolveError(
-            `Failed to resolve import: ${err instanceof Error ? err.message : String(err)}`
+            `Failed to resolve import: ${err instanceof Error ? err.message : String(err)}`,
+            err instanceof ResolveError ? err.location : void 0
           )
         );
       }
@@ -44681,10 +45640,14 @@ var Resolver = class {
       const markerCommit = version && /^[0-9a-f]{40}$/i.test(version) && !/^0{40}$/.test(version) ? version : null;
       const lockedCommit = lockfileCommit ?? markerCommit;
       if (this.options.lockfile && !lockfileCommit) {
-        throw new Error(`Remote dependency is not pinned by the lockfile: ${repoUrl}`);
+        throw new Error(
+          `Remote dependency is not pinned by the lockfile: ${repoUrl}. Run 'prs lock' to pin it, then re-run this command.`
+        );
       }
       const requestedRef = lockEntry?.version ?? (version || void 0);
       const tag = requestedRef && requestedRef !== "latest" && !/^[0-9a-f]{40}$/i.test(requestedRef) ? requestedRef : void 0;
+      const subPathLastSlash = subPath.lastIndexOf("/");
+      const sparseCone = subPathLastSlash > 0 ? subPath.slice(0, subPathLastSlash) : void 0;
       let cachePath;
       let vendoredPath = null;
       const vendorManifest = this.options.vendorDir ? await loadVendorManifest(this.options.vendorDir) : null;
@@ -44693,7 +45656,9 @@ var Resolver = class {
       }
       if (this.options.vendorDir && vendorManifest) {
         if (!lockEntry || !lockedCommit) {
-          throw new Error(`Vendored dependency is not pinned by the lockfile: ${repoUrl}`);
+          throw new Error(
+            `Vendored dependency is not pinned by the lockfile: ${repoUrl}. Run 'prs lock' to pin it, then re-run this command.`
+          );
         }
         vendoredPath = await resolveVendoredRepository(
           this.options.vendorDir,
@@ -44711,12 +45676,7 @@ var Resolver = class {
         if (lockedCommit) {
           let cacheMatchesLock = false;
           try {
-            await verifyGitRepositoryCheckout(
-              cachePath,
-              ".git",
-              lockedCommit,
-              /* @__PURE__ */ new Set([".prs-registry-meta.json"])
-            );
+            await this.verifyCacheCommit(cachePath, lockedCommit);
             cacheMatchesLock = true;
           } catch {
             cacheMatchesLock = false;
@@ -44730,17 +45690,16 @@ var Resolver = class {
             this.logger.verbose(
               `Registry cache does not match locked commit for ${repoUrl}. Re-cloning.`
             );
-            const cloneRepoUrl = repoUrl;
-            const fallbackRepoUrl = lockEntry?.gitUrl ?? (this.options.registries ? findFallbackUrl(repoUrl, this.options.registries) : void 0);
-            await this.gitRegistry.cloneAtTag(cloneRepoUrl, tag, cachePath, fallbackRepoUrl);
-            await this.gitRegistry.checkoutCommit(cachePath, lockedCommit);
-            await this.registryCache.set(repoUrl, effectiveVersion, lockedCommit);
-            await verifyGitRepositoryCheckout(
+            const gitRegistry = await this.cloneRegistryIntoCache(
+              repoUrl,
               cachePath,
-              ".git",
-              lockedCommit,
-              /* @__PURE__ */ new Set([".prs-registry-meta.json"])
+              tag,
+              sparseCone,
+              lockEntry
             );
+            await gitRegistry.checkoutCommit(cachePath, lockedCommit);
+            await this.registryCache.set(repoUrl, effectiveVersion, lockedCommit);
+            await this.verifyCacheCommit(cachePath, lockedCommit);
           }
         }
       } else {
@@ -44751,22 +45710,21 @@ var Resolver = class {
         }
         this.logger.verbose(`Registry cache miss, cloning: ${repoUrl}@${tag ?? "default"}`);
         cachePath = this.registryCache.getCachePath(repoUrl, effectiveVersion);
-        const cloneRepoUrl = repoUrl;
-        const fallbackRepoUrl = lockEntry?.gitUrl ?? (this.options.registries ? findFallbackUrl(repoUrl, this.options.registries) : void 0);
-        await this.gitRegistry.cloneAtTag(cloneRepoUrl, tag, cachePath, fallbackRepoUrl);
+        const gitRegistry = await this.cloneRegistryIntoCache(
+          repoUrl,
+          cachePath,
+          tag,
+          sparseCone,
+          lockEntry
+        );
         if (lockedCommit) {
           this.logger.verbose(`Checking out locked commit: ${lockedCommit}`);
-          await this.gitRegistry.checkoutCommit(cachePath, lockedCommit);
+          await gitRegistry.checkoutCommit(cachePath, lockedCommit);
         }
         const commitHash = lockedCommit ?? lockEntry?.commit ?? "unknown";
         await this.registryCache.set(repoUrl, effectiveVersion, commitHash);
         if (lockedCommit) {
-          await verifyGitRepositoryCheckout(
-            cachePath,
-            ".git",
-            lockedCommit,
-            /* @__PURE__ */ new Set([".prs-registry-meta.json"])
-          );
+          await this.verifyCacheCommit(cachePath, lockedCommit);
         }
       }
       dependencies.add(cachePath);
@@ -44807,6 +45765,26 @@ var Resolver = class {
           };
         }
       }
+      if (!this.options.readOnly && existsSync9(cachePath) && existsSync9(join10(cachePath, ".git")) && !vendoredPath) {
+        const gitRegistry = this.getGitRegistry(repoUrl);
+        if (await gitRegistry.isSparseCheckout(cachePath)) {
+          const fileMissing = !isRoot && !existsSync9(resolvedFullPath);
+          const dirMissing = !isRoot && !existsSync9(join10(cachePath, subPath));
+          if (isRoot) {
+            this.logger.verbose(`Materializing full checkout for root import: ${repoUrl}`);
+            await gitRegistry.disableSparseCheckout(cachePath);
+          } else if (fileMissing || dirMissing) {
+            this.logger.verbose(`Widening sparse checkout for ${repoUrl}: ${subPath}`);
+            const paths = /* @__PURE__ */ new Set();
+            if (sparseCone) {
+              paths.add(sparseCone);
+            } else if (!isMdPath && !subPath.endsWith(".prs")) {
+              paths.add(subPath);
+            }
+            await gitRegistry.addSparsePaths(cachePath, [...paths]);
+          }
+        }
+      }
       let resolvedAST = null;
       if (!isRoot && existsSync9(resolvedFullPath) && isMdPath) {
         this.logger.debug(`Found .md file: ${resolvedFullPath}`);
@@ -44935,10 +45913,10 @@ var Resolver = class {
     this.logger.debug(`Found ${Object.keys(properties).length} skill(s) in directory: ${dirPath}`);
     const program2 = {
       type: "Program",
-      blocks: [makeBlock("skills", makeObjectContent(properties))],
+      blocks: [makeBlock("skills", makeObjectContent(properties, dirPath), dirPath)],
       uses: [],
       extends: [],
-      loc: VIRTUAL_LOC
+      loc: fileLoc(dirPath)
     };
     return { ast: program2 };
   }
@@ -45303,7 +46281,7 @@ var HttpRegistry = class {
    * Sleep for specified milliseconds.
    */
   sleep(ms) {
-    return new Promise((resolve42) => setTimeout(resolve42, ms));
+    return new Promise((resolve43) => setTimeout(resolve43, ms));
   }
   /**
    * Fetch with timeout.
@@ -45448,6 +46426,7 @@ function createHttpRegistry(options) {
 init_src();
 
 // packages/resolver/src/skill-validation.ts
+init_src();
 import { basename as basename12, dirname as dirname11, join as join12 } from "path";
 import { existsSync as existsSync11 } from "fs";
 function validateSkillFrontmatter(rawContent, options = {}) {
@@ -45464,11 +46443,15 @@ function validateSkillFrontmatter(rawContent, options = {}) {
   try {
     parsed = parseSkillMd(rawContent, options.filePath);
   } catch (error) {
-    issues.push({
+    const issue = {
       severity: "error",
       code: "SK000",
       message: error instanceof Error ? error.message : String(error)
-    });
+    };
+    if (error instanceof ResolveError && error.location) {
+      issue.location = error.location;
+    }
+    issues.push(issue);
     return { valid: false, issues };
   }
   validateName(parsed, options, issues);
@@ -45648,7 +46631,8 @@ function formatSkillValidationIssues(issues) {
   return issues.map((i) => {
     const tag = i.severity === "error" ? "\u2717" : "\u26A0";
     const field = i.field ? ` [${i.field}]` : "";
-    return `  ${tag} ${i.code}${field}: ${i.message}`;
+    const location = i.location ? ` (at ${i.location.file}:${i.location.line}:${i.location.column})` : "";
+    return `  ${tag} ${i.code}${field}: ${i.message}${location}`;
   }).join("\n");
 }
 
@@ -47388,6 +48372,19 @@ var authorityInjection = {
   }
 };
 
+// packages/validator/src/external-content.ts
+import { isAbsolute as isAbsolute8, relative as relative9, sep as sep6 } from "node:path";
+function isPathInside(root, candidate) {
+  const relation = relative9(root, candidate);
+  return relation === "" || relation !== ".." && !relation.startsWith(`..${sep6}`) && !isAbsolute8(relation);
+}
+function isExternalLocation(loc, config) {
+  if (config.scanExternalContent || !loc) return false;
+  const roots = config.externalRoots;
+  if (!roots || roots.length === 0) return false;
+  return roots.some((root) => isPathInside(root, loc.file));
+}
+
 // packages/validator/src/rules/obfuscated-content.ts
 var MIN_ENCODED_LENGTH = 16;
 var DECODED_CONTENT_SECURITY_PATTERNS = [
@@ -47568,6 +48565,19 @@ function isLikelyTechnicalContent(match2) {
   }
   return false;
 }
+var NUCLEOTIDE_CHARS = new Set("ACGTUN");
+var AMINO_ACID_CHARS = new Set("ACDEFGHIKLMNPQRSTVWYBXZJOU");
+var BIO_CONTEXT_PATTERN = /\b(?:protein|peptide|amino[-\s]?acid|residue|sequence|nucleotide|genome|transcript|fasta|uniprot)\b/i;
+function isOverAlphabet(match2, alphabet) {
+  for (const char of match2) {
+    if (!alphabet.has(char)) return false;
+  }
+  return match2.length > 0;
+}
+function isLikelyBioSequence(text, match2) {
+  if (isOverAlphabet(match2, NUCLEOTIDE_CHARS)) return true;
+  return isOverAlphabet(match2, AMINO_ACID_CHARS) && BIO_CONTEXT_PATTERN.test(text);
+}
 function isLikelyLegitimateBase64(text, match2) {
   const matchIndex = text.indexOf(match2);
   if (matchIndex === -1) return false;
@@ -47576,6 +48586,7 @@ function isLikelyLegitimateBase64(text, match2) {
   if (precedingText.includes("data:application/json")) return true;
   if (precedingText.includes("data:text/")) return true;
   if (isLikelyTechnicalContent(match2)) return true;
+  if (isLikelyBioSequence(text, match2)) return true;
   return false;
 }
 function isLikelyHashOrUuid(hex) {
@@ -47784,12 +48795,16 @@ var obfuscatedContent = {
             suggestion: "Encoded content is automatically decoded and checked for security patterns. Remove the malicious payload or use plain text."
           });
         }
-        const hasLongBase64 = (text.match(BASE64_PATTERN) || []).some(
+        if (isExternalLocation(loc, ctx.config)) {
+          return;
+        }
+        const longBase64Match = (text.match(BASE64_PATTERN) || []).find(
           (m) => m.length >= MIN_ENCODED_LENGTH * 2 && !isLikelyLegitimateBase64(text, m)
         );
-        if (hasLongBase64 && encodedMatches.length === 0) {
+        if (longBase64Match && encodedMatches.length === 0) {
+          const snippet = longBase64Match.length > 20 ? `${longBase64Match.substring(0, 20)}...` : longBase64Match;
           ctx.report({
-            message: "Long Base64-encoded content detected that may hide payloads",
+            message: `Long Base64-encoded content detected that may hide payloads (starts with "${snippet}")`,
             location: loc,
             suggestion: "If this is intentional, consider using plain text or documenting the purpose"
           });
@@ -48697,11 +49712,14 @@ var safeReferenceContent = {
         const content = res["content"];
         if (typeof relPath !== "string" || typeof content !== "string") continue;
         if (!relPath.startsWith("references/") && !relPath.includes("/references/")) continue;
+        const origin = res["origin"];
+        const location = typeof origin === "string" ? { file: origin, line: 1, column: 1, offset: 0 } : skillsBlock.loc;
+        if (isExternalLocation(location, ctx.config)) continue;
         const match2 = content.match(DIRECTIVE_PATTERN);
         if (match2) {
           ctx.report({
             message: `Reference file "${relPath}" in skill "${skillName}" contains PRS directive '${match2[1]}' \u2014 references should contain data, not instructions`,
-            location: skillsBlock.loc,
+            location,
             suggestion: "Remove PRS directives from reference files. References are data files, not PromptScript source."
           });
         }
@@ -50512,18 +51530,18 @@ var SECURITY_STRICT_MULTILINGUAL = {
 };
 
 // packages/compiler/src/compiler.ts
-import { dirname as dirname13, isAbsolute as isAbsolute9, join as join13, relative as relative10, resolve as resolve15, sep as sep7 } from "path";
+import { dirname as dirname13, isAbsolute as isAbsolute10, join as join13, relative as relative11, resolve as resolve15, sep as sep8 } from "path";
 
 // packages/compiler/src/hook-script-validator.ts
 init_src();
 init_src4();
 import { lstat as lstat7, realpath as realpath4 } from "fs/promises";
 import { realpathSync, statSync } from "fs";
-import { dirname as dirname12, isAbsolute as isAbsolute8, relative as relative9, resolve as resolve14, sep as sep6 } from "path";
+import { dirname as dirname12, isAbsolute as isAbsolute9, relative as relative10, resolve as resolve14, sep as sep7 } from "path";
 var PROJECT_MARKERS = [".promptscript", ".git", "package.json"];
 function isInside2(root, candidate) {
-  const relation = relative9(root, candidate);
-  return relation === "" || !relation.startsWith(`..${sep6}`) && relation !== ".." && !isAbsolute8(relation);
+  const relation = relative10(root, candidate);
+  return relation === "" || !relation.startsWith(`..${sep7}`) && relation !== ".." && !isAbsolute9(relation);
 }
 function isProjectMarker(directory, marker) {
   const markerPath = resolve14(directory, marker);
@@ -50561,10 +51579,10 @@ function inferProjectRoot(localPath, configuredProjectRoot, entryPath) {
     if (markedRoot) return markedRoot;
   }
   const local = localPath ? resolve14(localPath) : entryPath ? dirname12(resolve14(entryPath)) : process.cwd();
-  const promptScriptDirectory = `${sep6}.promptscript`;
-  const nestedMarker = `${promptScriptDirectory}${sep6}`;
+  const promptScriptDirectory = `${sep7}.promptscript`;
+  const nestedMarker = `${promptScriptDirectory}${sep7}`;
   const nestedIndex = local.indexOf(nestedMarker);
-  if (nestedIndex >= 0) return local.slice(0, nestedIndex) || sep6;
+  if (nestedIndex >= 0) return local.slice(0, nestedIndex) || sep7;
   return local.endsWith(promptScriptDirectory) ? dirname12(local) : local;
 }
 async function validateHookScriptResources(ast, projectRoot) {
@@ -50632,7 +51650,7 @@ function resolverCacheKey(projectRoot) {
 function resolveEntryPath(entryPath) {
   if (entryPath.startsWith("@")) return entryPath;
   const fileName = entryPath.endsWith(".prs") || entryPath.endsWith(".md") ? entryPath : `${entryPath}.prs`;
-  const absolutePath = isAbsolute9(fileName) ? fileName : resolve15(process.cwd(), fileName);
+  const absolutePath = isAbsolute10(fileName) ? fileName : resolve15(process.cwd(), fileName);
   try {
     return realpathSync2.native(absolutePath);
   } catch {
@@ -50686,7 +51704,7 @@ function normalizeOutputDir(dir) {
 }
 function matchesWatchPattern(path2, pattern, baseDir) {
   const normalizedPath = path2.replace(/\\/g, "/");
-  const relativePath = relative10(baseDir, path2).replace(/\\/g, "/");
+  const relativePath = relative11(baseDir, path2).replace(/\\/g, "/");
   const candidates = [relativePath, normalizedPath].flatMap((candidate) => [
     candidate,
     candidate.endsWith("/") ? candidate : `${candidate}/`
@@ -50698,7 +51716,7 @@ function matchesWatchPattern(path2, pattern, baseDir) {
   return candidates.some((candidate) => minimatch(candidate, pattern, matcherOptions));
 }
 function absoluteWatchPath(path2, baseDir = process.cwd()) {
-  return isAbsolute9(path2) ? resolve15(path2) : resolve15(baseDir, path2);
+  return isAbsolute10(path2) ? resolve15(path2) : resolve15(baseDir, path2);
 }
 function canonicalWatchPath(path2, baseDir = process.cwd()) {
   const absolutePath = absoluteWatchPath(path2, baseDir);
@@ -50721,8 +51739,8 @@ function watchPathKey(path2, baseDir = process.cwd()) {
   return normalizeWatchPath(canonicalWatchPath(path2, baseDir));
 }
 function isPathWithin(path2, root) {
-  const relation = relative10(normalizeWatchPath(root), normalizeWatchPath(path2));
-  return relation === "" || relation !== ".." && !relation.startsWith(`..${sep7}`) && !isAbsolute9(relation);
+  const relation = relative11(normalizeWatchPath(root), normalizeWatchPath(path2));
+  return relation === "" || relation !== ".." && !relation.startsWith(`..${sep8}`) && !isAbsolute10(relation);
 }
 function shouldIncludeSkill(name, config) {
   const includeSkills = config?.includeSkills;
@@ -50877,7 +51895,7 @@ var Compiler = class _Compiler {
       formatTime: 0,
       totalTime: 0
     };
-    const sourceLabel = isAbsolute9(entryPath) ? relative10(process.cwd(), entryPath) : entryPath;
+    const sourceLabel = isAbsolute10(entryPath) ? relative11(process.cwd(), entryPath) : entryPath;
     this.logger.verbose("=== Stage 1: Resolve ===");
     const startResolve = Date.now();
     let resolved;
@@ -50921,11 +51939,20 @@ var Compiler = class _Compiler {
       };
     }
     const compileErrors = [];
+    const externalRoots = [];
+    const cacheDir = this.options.resolver.cacheDir ?? join13(process.env["HOME"] ?? process.env["USERPROFILE"] ?? "/tmp", ".promptscript", "cache");
+    externalRoots.push(cacheDir);
+    if (this.options.resolver.vendorDir) {
+      externalRoots.push(this.options.resolver.vendorDir);
+    }
+    for (const roots of Object.values(this.options.resolver.referenceRoots ?? {})) {
+      externalRoots.push(...roots);
+    }
+    this.validator.updateConfig({ externalRoots });
     if (!this.options.ignoreHashes && this.options.resolver.lockfile) {
       this.logger.verbose("=== Stage 1.5: Reference Integrity ===");
       const registryReferences = /* @__PURE__ */ new Set();
       const registryReferencePaths = /* @__PURE__ */ new Map();
-      const cacheDir = this.options.resolver.cacheDir ?? join13(process.env["HOME"] ?? process.env["USERPROFILE"] ?? "/tmp", ".promptscript", "cache");
       const registryCache = new RegistryCache(cacheDir);
       const referenceRoots = [];
       for (const [repoUrl, dependency] of Object.entries(
@@ -50964,8 +51991,8 @@ var Compiler = class _Compiler {
         if (block.name !== "skills" || block.content.type !== "ObjectContent") continue;
         const sourceFile = block.loc.file;
         const referenceRoot = sourceFile ? referenceRoots.find((root) => {
-          const relation = relative10(resolve15(root.path), resolve15(sourceFile));
-          return relation === "" || relation !== ".." && !relation.startsWith(`..${sep7}`) && !isAbsolute9(relation);
+          const relation = relative11(resolve15(root.path), resolve15(sourceFile));
+          return relation === "" || relation !== ".." && !relation.startsWith(`..${sep8}`) && !isAbsolute10(relation);
         }) : void 0;
         for (const [, skillValue] of Object.entries(block.content.properties)) {
           if (typeof skillValue !== "object" || skillValue === null || !("references" in skillValue))
@@ -50977,8 +52004,8 @@ var Compiler = class _Compiler {
             registryReferences.add(ref);
             if (sourceFile && referenceRoot) {
               const resolvedReference = resolve15(dirname13(sourceFile), ref);
-              const relation = relative10(resolve15(referenceRoot.path), resolvedReference);
-              if (relation !== "" && relation !== ".." && !relation.startsWith(`..${sep7}`) && !isAbsolute9(relation)) {
+              const relation = relative11(resolve15(referenceRoot.path), resolvedReference);
+              if (relation !== "" && relation !== ".." && !relation.startsWith(`..${sep8}`) && !isAbsolute10(relation)) {
                 const sourceReferences = registryReferencePaths.get(sourceFile) ?? /* @__PURE__ */ new Map();
                 const relativePath = relation.replaceAll("\\", "/");
                 const referenceKey = `${referenceRoot.repoUrl}\0${relativePath}\0${referenceRoot.version}`;
@@ -51082,7 +52109,7 @@ var Compiler = class _Compiler {
         for (const warning of output.warnings ?? []) {
           formatWarnings.push({
             ruleId: warning.code,
-            ruleName: "target-hook-compatibility",
+            ruleName: warning.ruleName ?? "target-hook-compatibility",
             severity: "warning",
             message: warning.message,
             ...warning.suggestion ? { suggestion: warning.suggestion } : {},
@@ -51284,8 +52311,8 @@ var Compiler = class _Compiler {
    */
   async watch(entryPath, options = {}) {
     const { default: chokidar2 } = await import("chokidar");
-    const { dirname: dirname29, resolve: resolve42 } = await import("path");
-    const baseDir = dirname29(resolve42(entryPath));
+    const { dirname: dirname29, resolve: resolve43 } = await import("path");
+    const baseDir = dirname29(resolve43(entryPath));
     const includePatterns = options.include ?? ["**/*.prs"];
     const excludePatterns = options.exclude ?? ["**/node_modules/**"];
     const debounceMs = options.debounce ?? 300;
@@ -51336,7 +52363,7 @@ var Compiler = class _Compiler {
           ".promptscriptrc.yaml",
           ".promptscriptrc.yml",
           "promptscript.lock"
-        ].map((fileName) => resolve42(this.watchProjectRoot(entryPath), fileName))
+        ].map((fileName) => resolve43(this.watchProjectRoot(entryPath), fileName))
       ].map((path2) => watchPathKey(path2))
     );
     let dynamicDependencyPaths = toDependencyMap(this.resolvedDependencyPaths(entryPath));
@@ -51629,7 +52656,7 @@ var Pager = class {
       }
       return;
     }
-    return new Promise((resolve42) => {
+    return new Promise((resolve43) => {
       const pagerCmd = getPagerCommand();
       const [cmd, ...args] = pagerCmd.split(" ");
       if (cmd === "less" && !args.includes("-R")) {
@@ -51637,7 +52664,7 @@ var Pager = class {
       }
       if (!cmd) {
         console.log(content);
-        resolve42();
+        resolve43();
         return;
       }
       const pager = spawn2(cmd, args, {
@@ -51650,17 +52677,17 @@ var Pager = class {
       });
       pager.on("error", (_err) => {
         console.log(content);
-        resolve42();
+        resolve43();
       });
       pager.on("close", () => {
-        resolve42();
+        resolve43();
       });
       if (pager.stdin) {
         pager.stdin.write(content);
         pager.stdin.end();
       } else {
         console.log(content);
-        resolve42();
+        resolve43();
       }
     });
   }
@@ -51674,14 +52701,14 @@ init_services();
 
 // packages/cli/src/utils/registry-resolver.ts
 import { existsSync as existsSync12 } from "fs";
-import { isAbsolute as isAbsolute10, join as join14, relative as relative11, resolve as resolve16, sep as sep8 } from "path";
+import { isAbsolute as isAbsolute11, join as join14, relative as relative12, resolve as resolve16, sep as sep9 } from "path";
 async function resolveRegistrySubPath(repositoryPath, subPath) {
   if (!subPath) {
     return repositoryPath;
   }
   const result = resolve16(repositoryPath, subPath);
-  const relation = relative11(resolve16(repositoryPath), result);
-  if (relation === ".." || relation.startsWith(`..${sep8}`) || isAbsolute10(relation)) {
+  const relation = relative12(resolve16(repositoryPath), result);
+  if (relation === ".." || relation.startsWith(`..${sep9}`) || isAbsolute11(relation)) {
     throw new Error(`Registry path escapes its repository: ${subPath}`);
   }
   if (existsSync12(result) && !await isRealPathInside(result, repositoryPath)) {
@@ -51706,12 +52733,16 @@ async function resolveRegistryPath(config, options = {}) {
     if (options.vendorDir && existsSync12(options.vendorDir) && !vendorManifest) {
       throw new Error(`Vendor manifest is missing: ${options.vendorDir}`);
     }
-    if (options.lockfile && !lockedRepository) {
-      throw new Error(`Git registry is not pinned by the lockfile: ${gitConfig.url}`);
+    if (options.lockfile && !lockedRepository && !options.allowMissingLockEntry) {
+      throw new Error(
+        `Git registry is not pinned by the lockfile: ${gitConfig.url}. Run 'prs lock' to pin it, then re-run this command.`
+      );
     }
     if (options.vendorDir && vendorManifest) {
       if (!lockedRepository) {
-        throw new Error(`Vendored registry is not pinned by the lockfile: ${gitConfig.url}`);
+        throw new Error(
+          `Vendored registry is not pinned by the lockfile: ${gitConfig.url}. Run 'prs lock' to pin it, then re-run this command.`
+        );
       }
       const [repoUrl, dependency] = lockedRepository;
       const repositoryPath = await resolveVendoredRepository(
@@ -51751,7 +52782,8 @@ async function resolveRegistryPath(config, options = {}) {
           cachePath,
           ".git",
           lockedRepository[1].commit,
-          /* @__PURE__ */ new Set([".prs-cache-meta.json"])
+          /* @__PURE__ */ new Set([".prs-cache-meta.json"]),
+          { allowPartial: true }
         );
         return {
           path: await resolveRegistrySubPath(cachePath, gitConfig.path),
@@ -51780,6 +52812,7 @@ async function resolveRegistryPath(config, options = {}) {
       ref,
       path: gitConfig.path,
       auth: gitConfig.auth,
+      timeout: gitConfig.timeout,
       cache: {
         enabled: config.registry.cache?.enabled ?? true,
         ttl: config.registry.cache?.ttl
@@ -51803,7 +52836,8 @@ async function resolveRegistryPath(config, options = {}) {
         cachePath,
         ".git",
         lockedRepository[1].commit,
-        /* @__PURE__ */ new Set([".prs-cache-meta.json"])
+        /* @__PURE__ */ new Set([".prs-cache-meta.json"]),
+        { allowPartial: true }
       );
     }
     return {
@@ -51839,7 +52873,7 @@ init_src();
 // packages/cli/src/utils/conflict-detector.ts
 init_src();
 import * as fs4 from "fs";
-import { basename as basename13, dirname as dirname14, resolve as resolve17, relative as relative12, isAbsolute as isAbsolute11, sep as sep9 } from "path";
+import { basename as basename13, dirname as dirname14, resolve as resolve17, relative as relative13, isAbsolute as isAbsolute12, sep as sep10 } from "path";
 function detectOutputConflicts(targets) {
   const pathMap = /* @__PURE__ */ new Map();
   for (const target of targets) {
@@ -51860,14 +52894,14 @@ function detectOutputConflicts(targets) {
 function validateOutputPath(outputPath, outputRoot) {
   const resolved = resolveOutputPath(outputPath, outputRoot);
   const root = resolve17(outputRoot);
-  const rel = relative12(root, resolved);
+  const rel = relative13(root, resolved);
   if (!isPathContained(rel, false)) {
     return `Output path "${outputPath}" escapes the output directory ${outputRoot}`;
   }
   try {
     const realRoot = resolveThroughExistingAncestor(root);
     const realResolved = resolveThroughExistingAncestor(resolved);
-    if (!isPathContained(relative12(realRoot, realResolved), false)) {
+    if (!isPathContained(relative13(realRoot, realResolved), false)) {
       return `Output path "${outputPath}" escapes the output directory ${outputRoot}`;
     }
   } catch {
@@ -51876,11 +52910,11 @@ function validateOutputPath(outputPath, outputRoot) {
   return void 0;
 }
 function isPathInsideDir(dir, root) {
-  const rel = relative12(resolve17(root), resolveOutputPath(dir, root));
+  const rel = relative13(resolve17(root), resolveOutputPath(dir, root));
   return isPathContained(rel, true);
 }
 function isPathContained(rel, allowEqual) {
-  return allowEqual && rel === "" || rel !== "" && rel !== ".." && !rel.startsWith(`..${sep9}`) && !isAbsolute11(rel);
+  return allowEqual && rel === "" || rel !== "" && rel !== ".." && !rel.startsWith(`..${sep10}`) && !isAbsolute12(rel);
 }
 function resolveThroughExistingAncestor(path2) {
   const missingSegments = [];
@@ -51904,7 +52938,7 @@ function resolveThroughExistingAncestor(path2) {
   return resolve17(fs4.realpathSync.native(current), ...missingSegments);
 }
 function resolveOutputPath(outputPath, projectRoot) {
-  if (isAbsolute11(outputPath)) {
+  if (isAbsolute12(outputPath)) {
     return outputPath;
   }
   return resolve17(projectRoot, outputPath);
@@ -51923,12 +52957,14 @@ import {
   rmdir,
   unlink as unlink2
 } from "node:fs/promises";
-import { basename as basename14, dirname as dirname15, isAbsolute as isAbsolute12, relative as relative13, resolve as resolve18 } from "node:path";
+import { basename as basename14, dirname as dirname15, isAbsolute as isAbsolute13, relative as relative14, resolve as resolve18 } from "node:path";
 import { promisify as promisify2 } from "node:util";
 var execFileAsync2 = promisify2(execFile2);
 var PROMPTSCRIPT_MARKER_PATTERNS = [
   /^<!-- PromptScript \d{4}-\d{2}-\d{2}T[\d:.]+Z \| source: .+ \| target: .+ - do not edit -->$/,
   /^# promptscript-generated: \d{4}-\d{2}-\d{2}T[\d:.]+Z \| source: .+ \| target: .+$/,
+  /^\/\/ promptscript-generated: opencode-plugin$/,
+  /^\/\/ Generated by PromptScript - do not edit\.$/,
   /^> Auto-generated by PromptScript(?:\s.*)?$/
 ];
 var OWNED_COMMAND_FIELDS = /* @__PURE__ */ new Set([
@@ -52256,7 +53292,7 @@ function collectManagedDirectories(outputs, outputRoot) {
   for (const output of outputs.values()) {
     for (const directory of output.managedOutputDirectories ?? []) {
       const normalized = directory.replace(/\\/g, "/");
-      if (!normalized || isAbsolute12(normalized)) continue;
+      if (!normalized || isAbsolute13(normalized)) continue;
       if (normalized.split("/").some((segment) => segment === "..")) continue;
       const absolutePath = resolve18(outputRoot, normalized);
       if (isWithin(outputRoot, absolutePath)) directories.add(absolutePath);
@@ -52277,7 +53313,7 @@ function collectManagedFiles(outputs, outputRoot) {
   for (const output of outputs.values()) {
     for (const file of output.managedOutputFiles ?? []) {
       const normalized = file.replace(/\\/g, "/");
-      if (!normalized || isAbsolute12(normalized)) continue;
+      if (!normalized || isAbsolute13(normalized)) continue;
       if (normalized.split("/").some((segment) => segment === "..")) continue;
       const absolutePath = resolve18(outputRoot, normalized);
       if (isWithin(outputRoot, absolutePath)) files.add(absolutePath);
@@ -52540,7 +53576,7 @@ async function removeIfUnchanged(entryPath, fileStat) {
   return true;
 }
 async function openAncestorDirectories(root, directory) {
-  const relativePath = relative13(root, directory);
+  const relativePath = relative14(root, directory);
   const segments = relativePath === "" ? [] : relativePath.split(/[\\/]+/);
   const paths = [root];
   let current = root;
@@ -52564,8 +53600,8 @@ async function openAncestorDirectories(root, directory) {
   return guards;
 }
 async function openOrCreateAncestorDirectories(root, file) {
-  const relativePath = relative13(root, file);
-  if (relativePath.startsWith("..") || isAbsolute12(relativePath)) {
+  const relativePath = relative14(root, file);
+  if (relativePath.startsWith("..") || isAbsolute13(relativePath)) {
     return void 0;
   }
   await mkdir4(root, { recursive: true });
@@ -53015,8 +54051,8 @@ function scanHookOwnership(value) {
   return scanHookOwnership(Object.values(object));
 }
 function isWithin(root, candidate) {
-  const relativePath = relative13(root, candidate);
-  return relativePath === "" || !relativePath.startsWith("..") && !isAbsolute12(relativePath);
+  const relativePath = relative14(root, candidate);
+  return relativePath === "" || !relativePath.startsWith("..") && !isAbsolute13(relativePath);
 }
 function isNodeError(error) {
   return error instanceof Error && "code" in error;
@@ -53057,6 +54093,8 @@ async function loadBundledSkillContent(logger) {
 var PROMPTSCRIPT_MARKERS2 = [
   "<!-- PromptScript",
   "# promptscript-generated:",
+  "// promptscript-generated:",
+  "// Generated by PromptScript - do not edit.",
   "> Auto-generated by PromptScript"
 ];
 function hasPromptScriptMarker(content) {
@@ -53246,11 +54284,77 @@ async function finalizeOutputPlan(result, options) {
   };
 }
 
+// packages/cli/src/utils/resource-filter.ts
+init_src();
+function collectResourceKinds(value, previous) {
+  return [...previous, ...value.split(",").map((item) => item.trim())].filter(Boolean);
+}
+function parseResourceSelection(values) {
+  if (!values || values.length === 0) return { kinds: [], invalid: [] };
+  const kinds = [];
+  const invalid = [];
+  for (const raw of values.flatMap((value) => value.split(","))) {
+    const item = raw.trim();
+    if (!item) continue;
+    if (isOutputResourceKind(item)) {
+      if (!kinds.includes(item)) kinds.push(item);
+    } else if (!invalid.includes(item)) {
+      invalid.push(item);
+    }
+  }
+  return { kinds, invalid };
+}
+function filterOutputsByResources(plan, outputs, kinds, skillBaseDirs) {
+  const filtered = /* @__PURE__ */ new Map();
+  for (const file of plan.files) {
+    if (!kinds.has(classifyOutputResource(file.owner, file.path, skillBaseDirs?.get(file.owner)))) {
+      continue;
+    }
+    const existing = outputs.get(file.path);
+    filtered.set(
+      file.path,
+      existing ?? {
+        path: file.path,
+        content: file.content,
+        ...file.mode !== void 0 ? { mode: file.mode } : {},
+        ...file.merge !== void 0 ? { merge: file.merge } : {},
+        ...file.managedOutputDirectories !== void 0 ? { managedOutputDirectories: file.managedOutputDirectories } : {},
+        ...file.managedOutputFiles !== void 0 ? { managedOutputFiles: file.managedOutputFiles } : {}
+      }
+    );
+  }
+  return {
+    outputs: filtered,
+    kept: filtered.size,
+    dropped: plan.files.length - filtered.size
+  };
+}
+
+// packages/cli/src/utils/global-output-safety.ts
+import { homedir as homedir3 } from "node:os";
+import { resolve as resolve21 } from "node:path";
+var PROTECTED_USER_FILES = [
+  {
+    // Factory AI contract: ~/.factory/AGENTS.md is a personal override file.
+    path: ".factory/AGENTS.md",
+    reason: "Factory personal override (~/.factory/AGENTS.md is user-owned, never compiler output)"
+  }
+];
+function describeProtectedUserFile(absolutePath) {
+  const home = homedir3();
+  for (const entry of PROTECTED_USER_FILES) {
+    if (absolutePath === resolve21(home, entry.path)) {
+      return { displayPath: `~/${entry.path}`, reason: entry.reason };
+    }
+  }
+  return void 0;
+}
+
 // packages/cli/src/commands/compile.ts
 init_build_profile();
 init_target_config();
 async function loadCompileLockfile(projectRoot, logger) {
-  const lockfilePath = resolve21(projectRoot, "promptscript.lock");
+  const lockfilePath = resolve22(projectRoot, "promptscript.lock");
   if (!existsSync14(lockfilePath)) {
     return void 0;
   }
@@ -53268,7 +54372,7 @@ async function loadCompileLockfile(projectRoot, logger) {
 }
 function findConfigInDir(dir) {
   for (const file of CONFIG_FILES) {
-    const fullPath = resolve21(dir, file);
+    const fullPath = resolve22(dir, file);
     if (existsSync14(fullPath)) {
       return fullPath;
     }
@@ -53309,19 +54413,19 @@ function describeEmptyTargets(context) {
 }
 function resolveOutputBase(projectRoot, output) {
   if (!output) return projectRoot;
-  return isAbsolute13(output) ? output : resolve21(projectRoot, output);
+  return isAbsolute14(output) ? output : resolve22(projectRoot, output);
 }
 function resolveProjectPath(projectRoot, path2) {
-  return isAbsolute13(path2) ? path2 : resolve21(projectRoot, path2);
+  return isAbsolute14(path2) ? path2 : resolve22(projectRoot, path2);
 }
 function validateWritePathSymlinks(outputPath, outputRoot) {
-  const root = resolve21(outputRoot);
-  const candidate = resolve21(root, outputPath);
-  const relativePath = relative14(root, candidate);
-  if (relativePath === "" || relativePath.startsWith("..") || isAbsolute13(relativePath)) return;
+  const root = resolve22(outputRoot);
+  const candidate = resolve22(root, outputPath);
+  const relativePath = relative15(root, candidate);
+  if (relativePath === "" || relativePath.startsWith("..") || isAbsolute14(relativePath)) return;
   let current = root;
   for (const segment of relativePath.split(/[\\/]/)) {
-    current = resolve21(current, segment);
+    current = resolve22(current, segment);
     let stat5;
     try {
       stat5 = lstatSync2(current);
@@ -53452,10 +54556,21 @@ ${escaping.map((m) => `  - ${m}`).join("\n")}`,
       "PS1003" /* INVALID_PATH */
     );
   }
+  const protectedHits = plannedOutputs.map((output) => describeProtectedUserFile(resolve22(outputRoot, output.path))).filter((hit) => hit !== void 0);
+  if (protectedHits.length > 0) {
+    const protectedList = protectedHits.map((hit) => `  - ${hit.displayPath} (${hit.reason})`).join("\n");
+    throw new PSError(
+      `Refusing to write protected personal file(s):
+${protectedList}
+
+Personal override files are never compiler output. Use --resources to install generated agent and skill directories only.`,
+      "PS1003" /* INVALID_PATH */
+    );
+  }
   if (!options.dryRun && !options.force && !isTTY()) {
     const preflightConflicts = [];
     for (const output of plannedOutputs) {
-      const outputPath = options.output ? resolve21(options.output, output.path) : resolve21(output.path);
+      const outputPath = options.output ? resolve22(options.output, output.path) : resolve22(output.path);
       if (!existsSync14(outputPath)) continue;
       const existingContent = await readFileOrUndefined(outputPath);
       const contentMatches = existingContent !== void 0 && stripPromptScriptMarkers(existingContent) === stripPromptScriptMarkers(output.content);
@@ -53480,7 +54595,7 @@ Use --force to overwrite these files.`
     }
   }
   async function safeOverwrite(output, outputPath, existingContent, content) {
-    const outputRoot2 = options.output ? resolve21(options.output) : process.cwd();
+    const outputRoot2 = options.output ? resolve22(options.output) : process.cwd();
     const rewritten = existingContent !== void 0 && await rewriteHookOutputIfUnchanged(
       outputPath,
       outputRoot2,
@@ -53496,7 +54611,7 @@ Use --force to overwrite these files.`
     return rewritten;
   }
   async function safeCreate(output, outputPath, content) {
-    const outputRoot2 = options.output ? resolve21(options.output) : process.cwd();
+    const outputRoot2 = options.output ? resolve22(options.output) : process.cwd();
     const created = await createHookOutputSafely(outputPath, outputRoot2, content, output.mode);
     if (!created) {
       const msg = `Skipped '${outputPath}' because its output path was not safe to create.`;
@@ -53506,7 +54621,7 @@ Use --force to overwrite these files.`
     return created;
   }
   for (const output of plannedOutputs) {
-    const outputPath = options.output ? resolve21(options.output, output.path) : resolve21(output.path);
+    const outputPath = options.output ? resolve22(options.output, output.path) : resolve22(output.path);
     const fileExists3 = existsSync14(outputPath);
     const existingContent = fileExists3 ? await readFileOrUndefined(outputPath) : void 0;
     const existingHookOutputOwned = existingContent !== void 0 && isPromptScriptOwnedHookOutput(output.path, existingContent);
@@ -53543,7 +54658,7 @@ Use --force to overwrite these files.`
       if (output.mode !== void 0 && existingContent !== void 0) {
         const modeUpdated = await rewriteHookOutputIfUnchanged(
           outputPath,
-          options.output ? resolve21(options.output) : process.cwd(),
+          options.output ? resolve22(options.output) : process.cwd(),
           existingContent,
           existingContent,
           output.mode
@@ -53639,7 +54754,7 @@ function printWarnings(warnings) {
 }
 async function compileAllBuilds(options, services) {
   const logger = createCliLogger();
-  const projectRoot = options.cwd ? resolve21(options.cwd) : process.cwd();
+  const projectRoot = options.cwd ? resolve22(options.cwd) : process.cwd();
   const configPath = resolveCompileConfigPath(projectRoot, options);
   const config = await loadEffectiveConfig(configPath);
   const buildNames = Object.keys(getBuildProfiles(config));
@@ -53713,7 +54828,7 @@ async function compileCommandWithResult(options, services) {
   const spinner = createSpinner("Loading configuration...").start();
   const logger = createCliLogger();
   try {
-    const projectRoot = options.cwd ? resolve21(options.cwd) : process.cwd();
+    const projectRoot = options.cwd ? resolve22(options.cwd) : process.cwd();
     logger.verbose("Loading configuration...");
     const configPath = resolveCompileConfigPath(projectRoot, options);
     const config = await loadEffectiveConfig(configPath);
@@ -53728,6 +54843,17 @@ async function compileCommandWithResult(options, services) {
     } else {
       targets = parsedTargets;
     }
+    const cliResources = options.resources && options.resources.length > 0 ? options.resources : void 0;
+    const resourceSelection = parseResourceSelection(cliResources ?? config.output?.resources);
+    if (resourceSelection.invalid.length > 0) {
+      spinner.fail("Invalid resource selection");
+      ConsoleOutput.error(
+        `Unknown resource kind(s): ${resourceSelection.invalid.join(", ")}. Valid kinds: agents, skills, commands, mcp, hooks, plugins, main.`
+      );
+      process.exitCode = 1;
+      return false;
+    }
+    const resourceKinds = new Set(resourceSelection.kinds);
     if (targets.length === 0) {
       spinner.fail("No compilation targets");
       ConsoleOutput.error(
@@ -53762,7 +54888,7 @@ Disable one of the conflicting targets or assign a custom output path.`
       }
     }
     const lockfile = await loadCompileLockfile(projectRoot, logger);
-    const vendorDir = resolve21(projectRoot, ".promptscript/vendor");
+    const vendorDir = resolve22(projectRoot, ".promptscript/vendor");
     let registryPath;
     let referenceRoots;
     if (options.registry) {
@@ -53784,7 +54910,7 @@ Disable one of the conflicting targets or assign a custom output path.`
     if (config.includePromptScriptSkill !== false) {
       skillContent = await loadBundledSkillContent(logger);
     }
-    const localPath = resolve21(projectRoot, ".promptscript");
+    const localPath = resolve22(projectRoot, ".promptscript");
     const compiler = new Compiler({
       resolver: {
         registryPath,
@@ -53806,7 +54932,7 @@ Disable one of the conflicting targets or assign a custom output path.`
       ignoreHashes: options.ignoreHashes
     });
     const entry = buildProfile?.entry ?? config.input?.entry;
-    const entryPath = entry ? resolve21(projectRoot, entry) : resolve21(localPath, "project.prs");
+    const entryPath = entry ? resolve22(projectRoot, entry) : resolve22(localPath, "project.prs");
     if (!existsSync14(entryPath)) {
       spinner.fail("Entry file not found");
       ConsoleOutput.error(`File not found: ${entryPath}`);
@@ -53838,8 +54964,13 @@ Disable one of the conflicting targets or assign a custom output path.`
       output: resolveOutputBase(projectRoot, configuredOutput),
       force: options.force ?? config.output?.overwrite
     };
+    if (resourceKinds.size === 0 && effectiveOptions.output === homedir4()) {
+      ConsoleOutput.warning(
+        `Output directory is your home directory; root instruction files (for example CLAUDE.md, AGENTS.md) will be written there. Use --resources to install only generated agent and skill directories.`
+      );
+    }
     const hasFactoryTarget = targets.some((target) => target.name === "factory");
-    const migrateFactoryHooks = options.migrateFactoryHooks !== false;
+    const migrateFactoryHooks = options.migrateFactoryHooks !== false && resourceKinds.size === 0;
     const legacyMigration = hasFactoryTarget && migrateFactoryHooks ? await prepareLegacyFactoryMigration(result.outputs, effectiveOptions.output) : void 0;
     const legacySettingsPath = hasFactoryTarget && !migrateFactoryHooks ? await detectLegacyFactorySettingsHooks(effectiveOptions.output, true) : void 0;
     const finalized = await finalizeOutputPlan(result, {
@@ -53848,7 +54979,26 @@ Disable one of the conflicting targets or assign a custom output path.`
       logger,
       additionalOutputPaths: legacyMigration ? [".factory/hooks.json"] : []
     });
-    const writeResult = await writeOutputs(finalized.outputs, effectiveOptions, config, services);
+    let effectiveOutputs = finalized.outputs;
+    if (resourceKinds.size > 0) {
+      const skillBaseDirs = /* @__PURE__ */ new Map();
+      for (const target of targets) {
+        if (target.config?.skillBaseDir) {
+          skillBaseDirs.set(target.name, target.config.skillBaseDir);
+        }
+      }
+      const filtered = filterOutputsByResources(
+        finalized.outputPlan,
+        finalized.outputs,
+        resourceKinds,
+        skillBaseDirs
+      );
+      effectiveOutputs = filtered.outputs;
+      ConsoleOutput.info(
+        `Resource-only compile: kept ${filtered.kept} file(s), omitted ${filtered.dropped}`
+      );
+    }
+    const writeResult = await writeOutputs(effectiveOutputs, effectiveOptions, config, services);
     if (legacyMigration) {
       if (writeResult.skipped.includes(legacyMigration.hooksPath)) {
         throw new Error(
@@ -53862,30 +55012,38 @@ Disable one of the conflicting targets or assign a custom output path.`
         writeResult.created.includes(legacyMigration.hooksPath)
       );
     }
-    const plannedOutputMap = new Map(finalized.outputs);
-    const cleanupResult = await cleanupManagedOutputs(plannedOutputMap, {
-      outputRoot: effectiveOptions.output,
-      dryRun: options.dryRun
-    });
-    for (const removedPath of cleanupResult.removed) {
+    if (resourceKinds.size > 0) {
       if (options.dryRun) {
-        ConsoleOutput.dryRun(`Would remove obsolete generated file: ${removedPath}`);
+        ConsoleOutput.dryRun("Would skip managed cleanup for resource-only compile");
       } else {
-        ConsoleOutput.muted(`Removed obsolete generated file: ${removedPath}`);
+        ConsoleOutput.muted("Skipped managed cleanup for resource-only compile");
       }
-    }
-    for (const removedDirectory of cleanupResult.removedDirectories) {
-      if (options.dryRun) {
-        ConsoleOutput.dryRun(`Would remove empty managed directory: ${removedDirectory}`);
-      } else {
-        ConsoleOutput.muted(`Removed empty managed directory: ${removedDirectory}`);
+    } else {
+      const plannedOutputMap = new Map(finalized.outputs);
+      const cleanupResult = await cleanupManagedOutputs(plannedOutputMap, {
+        outputRoot: effectiveOptions.output,
+        dryRun: options.dryRun
+      });
+      for (const removedPath of cleanupResult.removed) {
+        if (options.dryRun) {
+          ConsoleOutput.dryRun(`Would remove obsolete generated file: ${removedPath}`);
+        } else {
+          ConsoleOutput.muted(`Removed obsolete generated file: ${removedPath}`);
+        }
       }
-    }
-    for (const rewrittenPath of cleanupResult.rewritten ?? []) {
-      if (options.dryRun) {
-        ConsoleOutput.dryRun(`Would rewrite mixed managed hook file: ${rewrittenPath}`);
-      } else {
-        ConsoleOutput.muted(`Rewrote mixed managed hook file: ${rewrittenPath}`);
+      for (const removedDirectory of cleanupResult.removedDirectories) {
+        if (options.dryRun) {
+          ConsoleOutput.dryRun(`Would remove empty managed directory: ${removedDirectory}`);
+        } else {
+          ConsoleOutput.muted(`Removed empty managed directory: ${removedDirectory}`);
+        }
+      }
+      for (const rewrittenPath of cleanupResult.rewritten ?? []) {
+        if (options.dryRun) {
+          ConsoleOutput.dryRun(`Would rewrite mixed managed hook file: ${rewrittenPath}`);
+        } else {
+          ConsoleOutput.muted(`Rewrote mixed managed hook file: ${rewrittenPath}`);
+        }
       }
     }
     spinner.succeed("Compilation successful");
@@ -53953,10 +55111,10 @@ function watchForChanges(projectRoot, watchConfig, callback) {
   const includePatterns = watchConfig?.include ?? DEFAULT_WATCH_INCLUDE;
   const excludePatterns = watchConfig?.exclude ?? DEFAULT_WATCH_EXCLUDE;
   const matcherOptions = { dot: true, nocase: process.platform === "win32" };
-  const relativePath = (path2) => relative14(projectRoot, path2).replace(/\\/g, "/");
+  const relativePath = (path2) => relative15(projectRoot, path2).replace(/\\/g, "/");
   const matches = (path2, patterns) => {
-    const relative22 = relativePath(path2);
-    return patterns.some((pattern) => minimatch(relative22, pattern, matcherOptions));
+    const relative24 = relativePath(path2);
+    return patterns.some((pattern) => minimatch(relative24, pattern, matcherOptions));
   };
   const shouldCompile = (path2) => matches(path2, includePatterns) && !matches(path2, excludePatterns);
   const watcher = chokidar.watch(projectRoot, {
@@ -54030,7 +55188,7 @@ function watchForChanges(projectRoot, watchConfig, callback) {
 // packages/cli/src/commands/validate.ts
 init_loader2();
 init_console();
-import { resolve as resolve22, join as join15 } from "path";
+import { resolve as resolve23, join as join15 } from "path";
 import { existsSync as existsSync15, readFileSync as readFileSync4, writeFileSync, readdirSync } from "fs";
 init_src();
 init_src2();
@@ -54219,7 +55377,7 @@ function discoverPrsFiles(dir, strict = false, includeSymbolicLinks = false) {
   return results;
 }
 function loadValidationLockfile() {
-  const lockfilePath = resolve22("promptscript.lock");
+  const lockfilePath = resolve23("promptscript.lock");
   if (!existsSync15(lockfilePath)) {
     return void 0;
   }
@@ -54242,7 +55400,7 @@ async function validateCommand2(options) {
   try {
     const config = await loadConfig();
     const lockfile = loadValidationLockfile();
-    const vendorDir = resolve22(".promptscript/vendor");
+    const vendorDir = resolve23(".promptscript/vendor");
     if (!isJsonFormat) spinner.text = "Resolving registry...";
     const registry2 = await resolveRegistryPath(config, { vendorDir, lockfile });
     if (!isJsonFormat) spinner.text = "Validating...";
@@ -54264,7 +55422,7 @@ async function validateCommand2(options) {
       formatters: []
       // No formatters needed for validation only
     });
-    const entryPaths = options.files && options.files.length > 0 ? options.files.map((file) => resolve22(file)) : [resolve22(config.input?.entry ?? "./.promptscript/project.prs")];
+    const entryPaths = options.files && options.files.length > 0 ? options.files.map((file) => resolve23(file)) : [resolve23(config.input?.entry ?? "./.promptscript/project.prs")];
     for (const entryPath of entryPaths) {
       if (!existsSync15(entryPath)) {
         handleEntryNotFound(entryPath, isJsonFormat, spinner);
@@ -54317,16 +55475,16 @@ function outputJsonResult(result) {
   console.log(JSON.stringify(result, null, 2));
 }
 async function runFix(requestedFiles) {
-  const files = requestedFiles && requestedFiles.length > 0 ? requestedFiles.map((file) => resolve22(file)) : discoverPrsFiles(".promptscript");
+  const files = requestedFiles && requestedFiles.length > 0 ? requestedFiles.map((file) => resolve23(file)) : discoverPrsFiles(".promptscript");
   let fixedCount = 0;
   const configPath = findConfigFile();
   const config = configPath ? await loadConfig(configPath) : void 0;
   const lockfile = loadValidationLockfile();
-  const vendorDir = resolve22(".promptscript/vendor");
-  const registryPath = config ? (await resolveRegistryPath(config, { vendorDir, lockfile })).path : resolve22("./registry");
+  const vendorDir = resolve23(".promptscript/vendor");
+  const registryPath = config ? (await resolveRegistryPath(config, { vendorDir, lockfile })).path : resolve23("./registry");
   const resolver = new Resolver({
     registryPath,
-    localPath: resolve22("./.promptscript"),
+    localPath: resolve23("./.promptscript"),
     vendorDir,
     lockfile,
     registries: config?.registries,
@@ -54340,7 +55498,7 @@ async function runFix(requestedFiles) {
     if (typeof declaredVersion !== "string") continue;
     let ast = parseResult.ast;
     try {
-      const resolved = await resolver.resolve(resolve22(filePath));
+      const resolved = await resolver.resolve(resolve23(filePath));
       ast = resolved.ast ?? ast;
     } catch {
     }
@@ -54389,7 +55547,7 @@ init_loader2();
 init_console();
 import { mkdir as mkdir5, writeFile as writeFile4 } from "fs/promises";
 import { existsSync as existsSync16 } from "fs";
-import { resolve as resolve23, dirname as dirname17, relative as relative15 } from "path";
+import { resolve as resolve24, dirname as dirname17, relative as relative16 } from "path";
 async function pullCommand(options) {
   const spinner = createSpinner("Loading configuration...").start();
   try {
@@ -54409,10 +55567,10 @@ async function pullCommand(options) {
     spinner.text = `Pulling ${config.inherit}...`;
     const registry2 = await createRegistry(config, options, spinner);
     const inheritPath = parseInheritPath(config.inherit);
-    const destinationRoot = resolve23("./.promptscript/.inherited");
-    const destPath = resolve23(destinationRoot, inheritPath);
-    const destinationRelativePath = relative15(destinationRoot, destPath);
-    if (destinationRelativePath.startsWith("..") || resolve23(destPath) === resolve23(destinationRoot)) {
+    const destinationRoot = resolve24("./.promptscript/.inherited");
+    const destPath = resolve24(destinationRoot, inheritPath);
+    const destinationRelativePath = relative16(destinationRoot, destPath);
+    if (destinationRelativePath.startsWith("..") || resolve24(destPath) === resolve24(destinationRoot)) {
       throw new Error(`Invalid inheritance path: ${config.inherit}`);
     }
     if (options.dryRun) {
@@ -54460,6 +55618,8 @@ async function createRegistry(config, options, spinner) {
       ref: gitRef ?? gitConfig.ref,
       path: gitConfig.path,
       auth: gitConfig.auth,
+      timeout: gitConfig.timeout,
+      fallbackUrl: gitConfig.fallbackUrl,
       cache: {
         enabled: !options.refresh && (config.registry.cache?.enabled ?? true),
         ttl: config.registry.cache?.ttl
@@ -54487,7 +55647,7 @@ async function createRegistry(config, options, spinner) {
   if (!existsSync16(registryPath)) {
     throw new Error(`Local registry path not found: ${registryPath}`);
   }
-  return createFileSystemRegistry(resolve23(registryPath));
+  return createFileSystemRegistry(resolve24(registryPath));
 }
 function parseInheritVersion(inheritPath) {
   const versionIndex = inheritPath.lastIndexOf("@");
@@ -54546,7 +55706,7 @@ function handlePullError(error, spinner) {
 init_src();
 init_loader2();
 init_console();
-import { resolve as resolve25 } from "node:path";
+import { resolve as resolve26 } from "node:path";
 import { readFile as readFile18 } from "node:fs/promises";
 import { existsSync as existsSync18 } from "node:fs";
 init_loader();
@@ -54555,7 +55715,7 @@ init_loader();
 import { createHash as createHash5 } from "node:crypto";
 import { existsSync as existsSync17 } from "node:fs";
 import { lstat as lstat9, readFile as readFile17 } from "node:fs/promises";
-import { isAbsolute as isAbsolute14, relative as relative16, resolve as resolve24, sep as sep10 } from "node:path";
+import { isAbsolute as isAbsolute15, relative as relative17, resolve as resolve25, sep as sep11 } from "node:path";
 var DIFF_SCHEMA_VERSION = 1;
 var DIFF_SCHEMA_URL = "https://getpromptscript.dev/schema/diff/v1.json";
 var CHANGE_KIND_ORDER = {
@@ -54574,19 +55734,19 @@ function normalizePath2(path2) {
   return path2.replaceAll("\\", "/");
 }
 function reportPath(outputRoot, path2) {
-  const absolutePath = resolve24(outputRoot, path2);
-  const relation = normalizePath2(relative16(outputRoot, absolutePath));
+  const absolutePath = resolve25(outputRoot, path2);
+  const relation = normalizePath2(relative17(outputRoot, absolutePath));
   if (!relation || relation === ".") return normalizePath2(path2);
-  if (relation === ".." || relation.startsWith("../") || isAbsolute14(relation)) {
+  if (relation === ".." || relation.startsWith("../") || isAbsolute15(relation)) {
     return normalizePath2(path2);
   }
   return relation;
 }
 function reportSource(projectRoot, source) {
   const normalized = normalizePath2(source);
-  if (!isAbsolute14(source)) return normalized;
-  const relation = normalizePath2(relative16(projectRoot, source));
-  if (relation && relation !== ".." && !relation.startsWith("../") && !isAbsolute14(relation)) {
+  if (!isAbsolute15(source)) return normalized;
+  const relation = normalizePath2(relative17(projectRoot, source));
+  if (relation && relation !== ".." && !relation.startsWith("../") && !isAbsolute15(relation)) {
     return relation;
   }
   return normalized;
@@ -54745,15 +55905,15 @@ function createReport(success, changes, warnings, errors, includeContent, unchan
   };
 }
 function findManagedOutputOwner(removedPath, outputs, outputRoot, entryPath, projectRoot) {
-  const candidate = resolve24(removedPath);
+  const candidate = resolve25(removedPath);
   for (const output of outputs.values()) {
     const managedFile = (output.managedOutputFiles ?? []).some(
-      (file) => resolve24(outputRoot, file) === candidate
+      (file) => resolve25(outputRoot, file) === candidate
     );
     const managedDirectory = (directory) => {
-      const directoryPath = resolve24(outputRoot, directory);
-      const relation = relative16(directoryPath, candidate);
-      return relation === "" || relation !== ".." && !relation.startsWith(`..${sep10}`) && !isAbsolute14(relation);
+      const directoryPath = resolve25(outputRoot, directory);
+      const relation = relative17(directoryPath, candidate);
+      return relation === "" || relation !== ".." && !relation.startsWith(`..${sep11}`) && !isAbsolute15(relation);
     };
     if (managedFile || (output.managedOutputDirectories ?? []).some(managedDirectory)) {
       return outputIdentity(output, entryPath, projectRoot);
@@ -54772,8 +55932,8 @@ function createCompilationDiffErrorReport(errors, warnings, projectRoot, include
   );
 }
 async function buildCompilationDiff(options) {
-  const projectRoot = resolve24(options.projectRoot);
-  const outputRoot = resolve24(options.outputRoot);
+  const projectRoot = resolve25(options.projectRoot);
+  const outputRoot = resolve25(options.outputRoot);
   const includeContent = options.includeContent === true;
   const changes = [];
   const warnings = options.warnings.map((warning) => normalizeWarning(warning, projectRoot));
@@ -54782,7 +55942,7 @@ async function buildCompilationDiff(options) {
   for (const output of options.outputs.values()) {
     const identity = outputIdentity(output, options.entryPath, projectRoot);
     const path2 = reportPath(outputRoot, output.path);
-    const outputPath = resolve24(outputRoot, output.path);
+    const outputPath = resolve25(outputRoot, output.path);
     const desiredContent = output.content;
     const common = {
       target: identity.target,
@@ -54954,7 +56114,7 @@ function resolveUniversalDir2(universalDir) {
   return { universalDir: ".agents" };
 }
 async function loadDiffLockfile(projectRoot) {
-  const lockfilePath = resolve25(projectRoot, "promptscript.lock");
+  const lockfilePath = resolve26(projectRoot, "promptscript.lock");
   if (!existsSync18(lockfilePath)) {
     return void 0;
   }
@@ -54976,7 +56136,7 @@ function printNewFilePreview(content, showFull, pager) {
   }
 }
 async function compareOutput(output, outputRoot, showFull, pager) {
-  const outputPath = resolve25(outputRoot, output.path);
+  const outputPath = resolve26(outputRoot, output.path);
   const newContent = output.content;
   if (!existsSync18(outputPath)) {
     pager.write(chalk2.green(`+ ${outputPath} (new file)`));
@@ -55049,7 +56209,7 @@ async function diffCommand(options) {
       return;
     }
     const lockfile = await loadDiffLockfile(projectRoot);
-    const vendorDir = resolve25(projectRoot, ".promptscript/vendor");
+    const vendorDir = resolve26(projectRoot, ".promptscript/vendor");
     if (!isJsonFormat) spinner.text = "Resolving registry...";
     const registry2 = await resolveRegistryPath(config, {
       vendorDir,
@@ -55060,11 +56220,11 @@ async function diffCommand(options) {
     const logger = createDiffLogger(isJsonFormat);
     const prettierOptions = await resolvePrettierOptions(config, projectRoot);
     const skillContent = config.includePromptScriptSkill === false ? void 0 : await loadBundledSkillContent(logger);
-    const outputRoot = resolve25(projectRoot, buildProfile?.output ?? config.output?.baseDir ?? ".");
+    const outputRoot = resolve26(projectRoot, buildProfile?.output ?? config.output?.baseDir ?? ".");
     const compiler = new Compiler({
       resolver: {
         registryPath: registry2.path,
-        localPath: resolve25(projectRoot, ".promptscript"),
+        localPath: resolve26(projectRoot, ".promptscript"),
         projectRoot,
         vendorDir,
         readOnly: true,
@@ -55081,7 +56241,7 @@ async function diffCommand(options) {
       logger,
       skillContent
     });
-    const entryPath = resolve25(
+    const entryPath = resolve26(
       projectRoot,
       buildProfile?.entry ?? config.input?.entry ?? "./.promptscript/project.prs"
     );
@@ -55234,7 +56394,7 @@ function printSimpleDiff(existingLines, newLines, showFull, pager) {
 // packages/cli/src/commands/check.ts
 import { existsSync as existsSync19 } from "fs";
 import { readFile as readFile19 } from "fs/promises";
-import { resolve as resolve26 } from "path";
+import { resolve as resolve27 } from "path";
 import { parse as parseYaml8 } from "yaml";
 init_src();
 init_loader2();
@@ -55393,7 +56553,7 @@ async function checkCommand(_options) {
     }
     const effectiveEntries = getEffectiveEntryPaths(config);
     for (const entry of effectiveEntries) {
-      const entryPath = resolve26(entry);
+      const entryPath = resolve27(entry);
       const name = entry === (config.input?.entry ?? ".promptscript/project.prs") ? "Entry file" : `Entry file (${entry})`;
       if (existsSync19(entryPath)) {
         results.push({
@@ -55418,7 +56578,7 @@ async function checkCommand(_options) {
       });
       hasWarnings = true;
     } else if (config.registry?.path && !config.registry.git) {
-      const registryPath = resolve26(config.registry.path);
+      const registryPath = resolve27(config.registry.path);
       if (existsSync19(registryPath)) {
         results.push({
           name: "Registry path",
@@ -55503,10 +56663,10 @@ async function checkCommand(_options) {
         message: rootTargets.length === 0 ? `${targetNames.size} target(s) configured in build profiles` : `${targetNames.size} target(s) configured`
       });
     }
-    const existingEntries = effectiveEntries.filter((entry) => existsSync19(resolve26(entry)));
+    const existingEntries = effectiveEntries.filter((entry) => existsSync19(resolve27(entry)));
     if (existingEntries.length > 0) {
       try {
-        const lockfilePath = resolve26("promptscript.lock");
+        const lockfilePath = resolve27("promptscript.lock");
         let lockfile;
         if (existsSync19(lockfilePath)) {
           const parsed = parseYaml8(await readFile19(lockfilePath, "utf-8"), {
@@ -55522,12 +56682,12 @@ async function checkCommand(_options) {
             message: "promptscript.lock"
           });
         }
-        const vendorDir = resolve26(".promptscript/vendor");
+        const vendorDir = resolve27(".promptscript/vendor");
         const registry2 = await resolveRegistryPath(config, { vendorDir, lockfile });
         const compiler = new Compiler({
           resolver: {
-            registryPath: resolve26(registry2.path),
-            localPath: resolve26(".promptscript"),
+            registryPath: resolve27(registry2.path),
+            localPath: resolve27(".promptscript"),
             vendorDir,
             referenceRoots: registry2.repositoryUrl && registry2.repositoryPath ? { [registry2.repositoryUrl]: [registry2.repositoryPath] } : void 0,
             lockfile,
@@ -55542,7 +56702,7 @@ async function checkCommand(_options) {
         for (const entry of existingEntries) {
           const name = entry === (config.input?.entry ?? ".promptscript/project.prs") ? "Project resolution" : `Project resolution (${entry})`;
           try {
-            const result = await compiler.compile(resolve26(entry));
+            const result = await compiler.compile(resolve27(entry));
             if (result.errors.length > 0) {
               results.push({
                 name,
@@ -55629,7 +56789,7 @@ import { dirname as dirname18 } from "path";
 
 // packages/cli/src/utils/version-check.ts
 init_console();
-import { homedir as homedir3 } from "os";
+import { homedir as homedir5 } from "os";
 import { join as join16 } from "path";
 import { readFile as readFile20, writeFile as writeFile5, mkdir as mkdir6 } from "fs/promises";
 var NPM_REGISTRY_URL = "https://registry.npmjs.org/@promptscript/cli/latest";
@@ -55679,7 +56839,7 @@ function comparePrerelease2(current, latest) {
   return 0;
 }
 function getCacheDir() {
-  return join16(homedir3(), ".promptscript", ".cache");
+  return join16(homedir5(), ".promptscript", ".cache");
 }
 function getCachePath() {
   return join16(getCacheDir(), "version.json");
@@ -56107,7 +57267,7 @@ Then reference configs with \`@inherit\` or \`@use\`:
 }
 
 // packages/cli/src/utils/resolve-target-directory.ts
-import { join as join18, resolve as resolve27 } from "path";
+import { join as join18, resolve as resolve28 } from "path";
 
 // packages/cli/src/utils/slugify.ts
 function slugify(name) {
@@ -56118,7 +57278,7 @@ function slugify(name) {
 async function resolveTargetDirectory(options, services) {
   const { cwd, directoryArg, registryName, nonInteractive } = options;
   if (directoryArg) {
-    return resolve27(directoryArg);
+    return resolve28(directoryArg);
   }
   const empty = await isDirectoryEmpty(cwd, services.fs);
   if (empty && nonInteractive) {
@@ -56237,7 +57397,7 @@ async function registryInitCommand(directory, options, services = createDefaultS
 // packages/cli/src/commands/registry/validate.ts
 init_services();
 init_console();
-import { resolve as resolve28 } from "path";
+import { resolve as resolve29 } from "path";
 
 // packages/cli/src/utils/registry-validator.ts
 import { join as join19 } from "path";
@@ -56442,7 +57602,7 @@ async function registryValidateCommand(path2, options, services = createDefaultS
     process.exitCode = 1;
     return;
   }
-  const registryPath = resolve28(path2 ?? ".");
+  const registryPath = resolve29(path2 ?? ".");
   const spinner = createSpinner("Validating registry...").start();
   try {
     const result = await validateRegistry(registryPath, services);
@@ -56494,10 +57654,10 @@ async function registryValidateCommand(path2, options, services = createDefaultS
 // packages/cli/src/commands/registry/publish.ts
 init_services();
 init_console();
-import { resolve as resolve29, join as join20 } from "path";
+import { resolve as resolve30, join as join20 } from "path";
 import { execFileSync as execFileSync2 } from "child_process";
 async function registryPublishCommand(path2, options, services = createDefaultServices()) {
-  const registryPath = resolve29(path2 ?? ".");
+  const registryPath = resolve30(path2 ?? ".");
   try {
     if (!options.force) {
       const spinner2 = createSpinner("Validating registry...").start();
@@ -56535,7 +57695,7 @@ async function registryPublishCommand(path2, options, services = createDefaultSe
     let gitRoot;
     try {
       git("rev-parse", "--is-inside-work-tree");
-      gitRoot = resolve29(git("rev-parse", "--show-toplevel"));
+      gitRoot = resolve30(git("rev-parse", "--show-toplevel"));
     } catch {
       spinner.fail("Not a git repository");
       ConsoleOutput.muted("Initialize with: git init");
@@ -56813,7 +57973,7 @@ init_console();
 init_src();
 import { writeFile as writeFile7, readFile as readFile25 } from "fs/promises";
 import { existsSync as existsSync22 } from "fs";
-import { resolve as resolve32 } from "path";
+import { resolve as resolve33 } from "path";
 import { parse as parseYaml12, stringify as stringifyYaml3 } from "yaml";
 
 // packages/cli/src/commands/lock-scanner.ts
@@ -56836,6 +57996,63 @@ async function collectRemoteImports(entryPath, options) {
   const visited = /* @__PURE__ */ new Set();
   const seen = /* @__PURE__ */ new Set();
   const results = [];
+  function recordRemoteImport(path2, sourceFile, resolved) {
+    const marker = parseRegistryMarker(resolved);
+    if (!marker) {
+      return false;
+    }
+    const key = `${marker.repoUrl}\0${marker.path}\0${marker.version}`;
+    if (options.deduplicate === false || !seen.has(key)) {
+      seen.add(key);
+      results.push({
+        ...marker,
+        ...options.includeLocations ? {
+          sourceFile,
+          sourceLine: path2.loc.line,
+          rawSource: path2.raw
+        } : {}
+      });
+    }
+    return true;
+  }
+  async function scanLocalReference(resolved) {
+    if (!resolved.endsWith(".prs") && !resolved.endsWith(".md")) {
+      return;
+    }
+    if (existsSync21(resolved)) {
+      await scan(resolved);
+      return;
+    }
+    if (resolved.endsWith(".prs")) {
+      const skillDirectory = resolved.slice(0, -".prs".length);
+      if (existsSync21(skillDirectory)) {
+        const skillFile = join21(skillDirectory, "SKILL.md");
+        if (existsSync21(skillFile)) {
+          await scan(skillFile);
+        }
+        return;
+      }
+    }
+    if (options.strict) {
+      throw new Error(`Imported PromptScript file not found: ${resolved}`);
+    }
+  }
+  async function scanReference(path2, sourceFile) {
+    let resolved;
+    try {
+      resolved = loader.resolveRef(path2, sourceFile);
+    } catch (error) {
+      if (options.strict) {
+        throw new Error(`Cannot resolve import '${path2.raw}' in ${sourceFile}`, {
+          cause: error
+        });
+      }
+      return;
+    }
+    if (!recordRemoteImport(path2, sourceFile, resolved)) {
+      await scanLocalReference(resolved);
+    }
+  }
   async function scan(filePath) {
     if (visited.has(filePath)) return;
     visited.add(filePath);
@@ -56856,54 +58073,16 @@ async function collectRemoteImports(entryPath, options) {
       throw new Error(`Cannot scan invalid PromptScript file: ${filePath}: ${errors[0].message}`);
     }
     if (!ast) return;
-    for (const use of ast.uses) {
-      let resolved;
-      try {
-        resolved = loader.resolveRef(use.path, filePath);
-      } catch (error) {
-        if (options.strict) {
-          throw new Error(`Cannot resolve import '${use.path.raw}' in ${filePath}`, {
-            cause: error
-          });
-        }
-        continue;
-      }
-      const marker = parseRegistryMarker(resolved);
-      if (marker) {
-        const key = `${marker.repoUrl}\0${marker.path}\0${marker.version}`;
-        if (options.deduplicate === false || !seen.has(key)) {
-          seen.add(key);
-          results.push({
-            ...marker,
-            ...options.includeLocations ? {
-              sourceFile: filePath,
-              sourceLine: use.path.loc.line,
-              rawSource: use.path.raw
-            } : {}
-          });
-        }
-      } else {
-        if (!resolved.endsWith(".prs") && !resolved.endsWith(".md")) {
-          continue;
-        }
-        if (existsSync21(resolved)) {
-          await scan(resolved);
-          continue;
-        }
-        if (resolved.endsWith(".prs")) {
-          const skillDirectory = resolved.slice(0, -".prs".length);
-          if (existsSync21(skillDirectory)) {
-            const skillFile = join21(skillDirectory, "SKILL.md");
-            if (existsSync21(skillFile)) {
-              await scan(skillFile);
-            }
-            continue;
-          }
-        }
-        if (options.strict) {
-          throw new Error(`Imported PromptScript file not found: ${resolved}`);
-        }
-      }
+    const inlineUses = ast.blocks.flatMap(
+      (block) => block.name === "skills" && (block.content.type === "ObjectContent" || block.content.type === "MixedContent") ? block.content.inlineUses ?? [] : []
+    );
+    const paths = [
+      ...ast.inherit ? [ast.inherit.path] : [],
+      ...ast.uses.map((use) => use.path),
+      ...inlineUses.map((use) => use.path)
+    ];
+    for (const path2 of paths) {
+      await scanReference(path2, filePath);
     }
   }
   await scan(entryPath);
@@ -56911,16 +58090,16 @@ async function collectRemoteImports(entryPath, options) {
 }
 
 // packages/cli/src/commands/lock-references.ts
-import { homedir as homedir4 } from "os";
-import { resolve as resolve31, join as join22 } from "path";
+import { homedir as homedir6 } from "os";
+import { resolve as resolve32, join as join22 } from "path";
 
 // packages/cli/src/commands/lock-reference-scanner.ts
 import { readFile as readFile24 } from "fs/promises";
-import { dirname as dirname20, isAbsolute as isAbsolute15, relative as relative17, resolve as resolve30, sep as sep11 } from "path";
+import { dirname as dirname20, isAbsolute as isAbsolute16, relative as relative18, resolve as resolve31, sep as sep12 } from "path";
 async function collectRegistryReferences(ast, roots, existing = {}, lockedAt = (/* @__PURE__ */ new Date()).toISOString()) {
   const references = {};
   const sortedRoots = [...roots].sort(
-    (left, right) => resolve30(right.cachePath).length - resolve30(left.cachePath).length
+    (left, right) => resolve31(right.cachePath).length - resolve31(left.cachePath).length
   );
   for (const block of ast.blocks) {
     if (block.name !== "skills" || block.content.type !== "ObjectContent") {
@@ -56934,7 +58113,7 @@ async function collectRegistryReferences(ast, roots, existing = {}, lockedAt = (
       if (!Array.isArray(refs)) continue;
       for (const ref of refs) {
         if (typeof ref !== "string") continue;
-        const referencePath = isAbsolute15(ref) ? resolve30(ref) : resolve30(dirname20(block.loc.file), ref);
+        const referencePath = isAbsolute16(ref) ? resolve31(ref) : resolve31(dirname20(block.loc.file), ref);
         const root = sortedRoots.find(
           (candidate) => isInsideCachePath(referencePath, candidate.cachePath)
         );
@@ -56942,7 +58121,7 @@ async function collectRegistryReferences(ast, roots, existing = {}, lockedAt = (
         if (!await isRealPathInside(referencePath, root.cachePath)) {
           throw new Error(`Registry reference is missing or escapes its repository: ${ref}`);
         }
-        const relativePath = relative17(resolve30(root.cachePath), referencePath).split(sep11).join("/");
+        const relativePath = relative18(resolve31(root.cachePath), referencePath).split(sep12).join("/");
         const key = buildReferenceKey(root.repoUrl, relativePath, root.version);
         const hash = hashContent(await readFile24(referencePath));
         const previous = existing[key];
@@ -56962,9 +58141,9 @@ function normalizeRepository(value) {
 }
 async function generateLockfileReferences(config, entryPath, localPath, lockfile, imports) {
   const registry2 = await resolveRegistryPath(config, { lockfile });
-  const cacheDir = join22(homedir4(), ".promptscript", "cache");
+  const cacheDir = join22(homedir6(), ".promptscript", "cache");
   const resolver = new Resolver({
-    registryPath: resolve31(registry2.path),
+    registryPath: resolve32(registry2.path),
     localPath,
     lockfile,
     registries: config.registries,
@@ -57095,14 +58274,15 @@ async function lockCommand(options) {
       }
     }
     const projectRoot = process.cwd();
-    const localPath = resolve32(projectRoot, ".promptscript");
-    const entryPath = config.input?.entry ? resolve32(projectRoot, config.input.entry) : resolve32(localPath, "project.prs");
+    const localPath = resolve33(projectRoot, ".promptscript");
+    const entryPath = config.input?.entry ? resolve33(projectRoot, config.input.entry) : resolve33(localPath, "project.prs");
     const registry2 = await resolveRegistryPath(config, {
+      allowMissingLockEntry: true,
       ...!options.update && Object.keys(existing.dependencies).length > 0 ? { lockfile: existing } : {}
     });
     const scannedImports = await collectRemoteImports(entryPath, {
       localPath,
-      registryPath: resolve32(registry2.path),
+      registryPath: resolve33(registry2.path),
       registries: config.registries,
       strict: true
     });
@@ -57116,7 +58296,8 @@ async function lockCommand(options) {
       requestedDependencies.set(defaultGitRegistry.url, {
         versions: /* @__PURE__ */ new Set([defaultGitRegistry.ref ?? "main"]),
         ...defaultGitRegistry.fallbackUrl ? { fallbackUrl: defaultGitRegistry.fallbackUrl } : {},
-        ...defaultGitRegistry.auth ? { auth: defaultGitRegistry.auth } : {}
+        ...defaultGitRegistry.auth ? { auth: defaultGitRegistry.auth } : {},
+        ...defaultGitRegistry.timeout !== void 0 ? { timeout: defaultGitRegistry.timeout } : {}
       });
     }
     for (const [, entry] of aliasEntries) {
@@ -57128,6 +58309,9 @@ async function lockCommand(options) {
       if (typeof entry !== "string" && entry.fallbackUrl) {
         requested.fallbackUrl = entry.fallbackUrl;
       }
+      if (typeof entry !== "string" && entry.timeout !== void 0) {
+        requested.timeout = entry.timeout;
+      }
       requestedDependencies.set(repoUrl, requested);
     }
     for (const imp of scannedImports) {
@@ -57152,7 +58336,8 @@ async function lockCommand(options) {
         previous,
         options.update === true && matchingRepos.includes(repoUrl),
         requested.fallbackUrl,
-        requested.auth
+        requested.auth,
+        { timeout: requested.timeout }
       );
       if (previous?.skills?.length && previous.commit !== resolved.commit) {
         throw new Error(
@@ -57322,7 +58507,7 @@ import {
   writeFile as writeFile8
 } from "fs/promises";
 import { existsSync as existsSync23 } from "fs";
-import { basename as basename15, dirname as dirname21, join as join23, resolve as resolve33 } from "path";
+import { basename as basename15, dirname as dirname21, join as join23, resolve as resolve34 } from "path";
 import { parse as parseYaml13 } from "yaml";
 var VENDOR_DIR = ".promptscript/vendor";
 async function vendorSyncCommand(options) {
@@ -57343,7 +58528,7 @@ async function vendorSyncCommand(options) {
       spinner.succeed(`Dry run completed (${deps.length} dependencies ready)`);
       return;
     }
-    const vendorDir = resolve33(VENDOR_DIR);
+    const vendorDir = resolve34(VENDOR_DIR);
     await validateVendorParentDirectory(vendorDir, true);
     const recoveredBackup = await recoverVendorDirectory(vendorDir);
     if (recoveredBackup) {
@@ -57416,7 +58601,7 @@ async function vendorCheckCommand(_options) {
     }
     const deps = getRepositoryDependencies(lockfile);
     validateDependencyPaths(deps);
-    const vendorDir = resolve33(VENDOR_DIR);
+    const vendorDir = resolve34(VENDOR_DIR);
     await validateVendorParentDirectory(vendorDir, false);
     const recoveredBackup = await recoverVendorDirectory(vendorDir);
     if (recoveredBackup) {
@@ -57597,10 +58782,10 @@ init_loader2();
 init_user_config();
 init_console();
 import { existsSync as existsSync24, readFileSync as readFileSync5, statSync as statSync2 } from "fs";
-import { join as join24, resolve as resolve34 } from "path";
-import { homedir as homedir5 } from "os";
+import { join as join24, resolve as resolve35 } from "path";
+import { homedir as homedir7 } from "os";
 import { parse as parseYaml14 } from "yaml";
-var CACHE_BASE = join24(homedir5(), ".promptscript", "cache");
+var CACHE_BASE = join24(homedir7(), ".promptscript", "cache");
 var LOCKFILE_PATH2 = "promptscript.lock";
 var VENDOR_DIR2 = ".promptscript/vendor";
 function loadLockfile2() {
@@ -57609,7 +58794,7 @@ function loadLockfile2() {
   }
   const parsed = parseYaml14(readFileSync5(LOCKFILE_PATH2, "utf-8"), { maxAliasCount: 100 });
   if (!isValidLockfile(parsed)) {
-    throw new Error(`Invalid lockfile: ${resolve34(LOCKFILE_PATH2)}`);
+    throw new Error(`Invalid lockfile: ${resolve35(LOCKFILE_PATH2)}`);
   }
   return parsed;
 }
@@ -57710,14 +58895,14 @@ async function resolveCommand(importPath, options) {
     }
     const reference = parseImportReference(importPath);
     const loader = new FileLoader({
-      registryPath: resolve34(config.registry?.path ?? "./registry"),
-      localPath: resolve34("./.promptscript"),
+      registryPath: resolve35(config.registry?.path ?? "./registry"),
+      localPath: resolve35("./.promptscript"),
       registries
     });
-    const resolvedReference = loader.resolveRef(reference, resolve34(".promptscript/project.prs"));
+    const resolvedReference = loader.resolveRef(reference, resolve35(".promptscript/project.prs"));
     const marker = parseRegistryMarker(resolvedReference);
     if (!marker) {
-      const localPath = resolve34(resolvedReference);
+      const localPath = resolve35(resolvedReference);
       printResolution(
         {
           import: importPath,
@@ -57738,7 +58923,7 @@ async function resolveCommand(importPath, options) {
     const cacheVersion = marker.version || "latest";
     const registryCache = new RegistryCache(CACHE_BASE);
     const cachePath = registryCache.getCachePath(marker.repoUrl, cacheVersion);
-    const vendorDir = resolve34(VENDOR_DIR2);
+    const vendorDir = resolve35(VENDOR_DIR2);
     const manifest = await loadVendorManifest(vendorDir);
     let repositoryPath = cachePath;
     let source = await registryCache.has(marker.repoUrl, cacheVersion) ? "cache" : "missing";
@@ -57747,7 +58932,9 @@ async function resolveCommand(importPath, options) {
     }
     if (manifest) {
       if (!lockKey || !dependency) {
-        throw new Error(`Vendored dependency is not pinned by the lockfile: ${marker.repoUrl}`);
+        throw new Error(
+          `Vendored dependency is not pinned by the lockfile: ${marker.repoUrl}. Run 'prs lock' to pin it, then re-run this command.`
+        );
       }
       const vendoredPath = await resolveVendoredRepository(
         vendorDir,
@@ -57766,7 +58953,10 @@ async function resolveCommand(importPath, options) {
           cachePath,
           ".git",
           dependency.commit,
-          /* @__PURE__ */ new Set([".prs-registry-meta.json"])
+          /* @__PURE__ */ new Set([".prs-registry-meta.json"]),
+          {
+            allowPartial: true
+          }
         );
       } catch {
         source = "stale cache";
@@ -57811,28 +59001,28 @@ async function resolveCommand(importPath, options) {
 
 // packages/cli/src/commands/inspect.ts
 import { existsSync as existsSync25 } from "fs";
-import { resolve as resolve35, basename as basename16 } from "path";
+import { resolve as resolve36, basename as basename16 } from "path";
 init_loader2();
 init_console();
 async function inspectCommand(skillName, options) {
   const isJson = options.format === "json";
   const spinner = isJson ? createSpinner("").stop() : createSpinner("Resolving...").start();
   try {
-    const projectRoot = options.cwd ? resolve35(options.cwd) : process.cwd();
-    const configPath = options.config ? resolve35(projectRoot, options.config) : options.cwd ? CONFIG_FILES.map((file) => resolve35(projectRoot, file)).find((file) => existsSync25(file)) : void 0;
+    const projectRoot = options.cwd ? resolve36(options.cwd) : process.cwd();
+    const configPath = options.config ? resolve36(projectRoot, options.config) : options.cwd ? CONFIG_FILES.map((file) => resolve36(projectRoot, file)).find((file) => existsSync25(file)) : void 0;
     if (options.cwd && !configPath) {
       throw new Error(`No PromptScript configuration found in ${projectRoot}. Run: prs init`);
     }
     const config = await loadConfig(configPath);
     const registry2 = await resolveRegistryPath(config);
-    const localPath = resolve35(projectRoot, ".promptscript");
+    const localPath = resolve36(projectRoot, ".promptscript");
     const resolver = new Resolver({
-      registryPath: registry2.isRemote ? registry2.path : resolve35(projectRoot, registry2.path),
+      registryPath: registry2.isRemote ? registry2.path : resolve36(projectRoot, registry2.path),
       localPath,
       projectRoot,
       registries: config.registries
     });
-    const entryPath = resolve35(projectRoot, config.input?.entry ?? ".promptscript/project.prs");
+    const entryPath = resolve36(projectRoot, config.input?.entry ?? ".promptscript/project.prs");
     if (!existsSync25(entryPath)) {
       spinner.stop();
       ConsoleOutput.error(`Entry file not found: ${entryPath}`);
@@ -58010,7 +59200,7 @@ function outputJson(skillName, skill, trace, sealed, composedFrom, baseSource) {
 // packages/cli/src/commands/explain.ts
 init_src();
 import { existsSync as existsSync26 } from "fs";
-import { relative as relative18, resolve as resolve36 } from "path";
+import { relative as relative19, resolve as resolve37 } from "path";
 init_loader2();
 init_console();
 function normalizePath3(path2) {
@@ -58091,7 +59281,7 @@ function findMatches(ast, trace, requestedPath) {
 }
 function sanitizePath(path2, options) {
   if (options.absolutePaths || !path2.startsWith("/")) return path2;
-  const relativePath = relative18(options.projectRoot, path2);
+  const relativePath = relative19(options.projectRoot, path2);
   return relativePath || ".";
 }
 function sanitizeText(value, options) {
@@ -58221,24 +59411,24 @@ async function explainCommand(targetPath, options) {
   const isJson = options.format === "json";
   const spinner = isJson ? createSpinner("").stop() : createSpinner("Resolving...").start();
   const outputOptions = {
-    projectRoot: resolve36(options.cwd ?? process.cwd()),
+    projectRoot: resolve37(options.cwd ?? process.cwd()),
     absolutePaths: options.absolutePaths === true
   };
   try {
     const projectRoot = outputOptions.projectRoot;
-    const configPath = options.config ? resolve36(projectRoot, options.config) : options.cwd ? CONFIG_FILES.map((file) => resolve36(projectRoot, file)).find((file) => existsSync26(file)) : void 0;
+    const configPath = options.config ? resolve37(projectRoot, options.config) : options.cwd ? CONFIG_FILES.map((file) => resolve37(projectRoot, file)).find((file) => existsSync26(file)) : void 0;
     if (options.cwd && !configPath) {
       throw new Error(`No PromptScript configuration found in ${projectRoot}. Run: prs init`);
     }
     const config = await loadConfig(configPath);
     const registry2 = await resolveRegistryPath(config);
     const resolver = new Resolver({
-      registryPath: registry2.isRemote ? registry2.path : resolve36(projectRoot, registry2.path),
-      localPath: resolve36(projectRoot, ".promptscript"),
+      registryPath: registry2.isRemote ? registry2.path : resolve37(projectRoot, registry2.path),
+      localPath: resolve37(projectRoot, ".promptscript"),
       projectRoot,
       registries: config.registries
     });
-    const entryPath = resolve36(projectRoot, config.input?.entry ?? ".promptscript/project.prs");
+    const entryPath = resolve37(projectRoot, config.input?.entry ?? ".promptscript/project.prs");
     if (!existsSync26(entryPath)) {
       spinner.stop();
       ConsoleOutput.error(`Entry file not found: ${sanitizePath(entryPath, outputOptions)}`);
@@ -58300,7 +59490,7 @@ init_console();
 // packages/cli/src/commands/import.ts
 init_src3();
 init_console();
-import { resolve as resolve37, join as join25, basename as basename17 } from "path";
+import { resolve as resolve38, join as join25, basename as basename17 } from "path";
 import { writeFileSync as writeFileSync2, mkdirSync, existsSync as existsSync27 } from "fs";
 import { stat as stat2, readdir as readdir8, readFile as readFile27, writeFile as writeFile9, mkdir as mkdir9 } from "fs/promises";
 function parseInstructionFrontmatter(content) {
@@ -58355,7 +59545,7 @@ async function importDirectory(dirPath) {
   return lines.join("\n");
 }
 async function importCommand(file, options) {
-  const filepath = resolve37(file);
+  const filepath = resolve38(file);
   const inputStat = await stat2(filepath).catch(() => null);
   if (inputStat?.isDirectory()) {
     try {
@@ -58364,7 +59554,7 @@ async function importCommand(file, options) {
         console.log(prsContent);
         return;
       }
-      const outputDir = resolve37(options.output ?? ".promptscript");
+      const outputDir = resolve38(options.output ?? ".promptscript");
       const outputPath = join25(outputDir, "imported.prs");
       if (existsSync27(outputPath) && !options.force) {
         reportOutputConflict(outputPath);
@@ -58398,11 +59588,11 @@ async function importCommand(file, options) {
       console.log(result.prsContent);
       return;
     }
-    const outputDir = resolve37(options.output ?? ".promptscript");
+    const outputDir = resolve38(options.output ?? ".promptscript");
     if (!existsSync27(outputDir)) {
       mkdirSync(outputDir, { recursive: true });
     }
-    const outputPath = resolve37(outputDir, "imported.prs");
+    const outputPath = resolve38(outputDir, "imported.prs");
     if (existsSync27(outputPath) && !options.force) {
       spinner.stop();
       reportOutputConflict(outputPath);
@@ -58772,11 +59962,11 @@ init_console();
 // packages/cli/src/telemetry/config.ts
 import { existsSync as existsSync30 } from "node:fs";
 import { mkdir as mkdir10, readFile as readFile29, rename as rename2, writeFile as writeFile10 } from "node:fs/promises";
-import { dirname as dirname22, isAbsolute as isAbsolute16, join as join29, resolve as resolve38 } from "node:path";
+import { dirname as dirname22, isAbsolute as isAbsolute17, join as join29, resolve as resolve39 } from "node:path";
 import { parseDocument as parseDocument2 } from "yaml";
 
 // packages/telemetry/src/config.ts
-import { homedir as homedir6 } from "node:os";
+import { homedir as homedir8 } from "node:os";
 import { join as join27 } from "node:path";
 var DEFAULT_TELEMETRY_ENDPOINT = "https://telemetry.guziak.net/v1/events";
 function isDisabled(value) {
@@ -58825,7 +60015,7 @@ function resolveTelemetryConfig(input2 = {}) {
   return {
     enabled: vetoes.length === 0,
     endpoint,
-    cacheDirectory: input2.cacheDirectory ?? join27(homedir6(), ".promptscript", ".cache"),
+    cacheDirectory: input2.cacheDirectory ?? join27(homedir8(), ".promptscript", ".cache"),
     vetoes
   };
 }
@@ -58911,7 +60101,8 @@ var promptscript_v1_default = {
     "mimo",
     "deep-agents",
     "forgecode",
-    "hermes"
+    "hermes",
+    "gitlab-duo"
   ],
   limits: {
     maxEvents: 25,
@@ -59433,7 +60624,7 @@ var FLUSH_BUDGET_MS = 5e3;
 var MAX_BATCHES_PER_FLUSH = 3;
 var COMPLETION_RETRIES = 20;
 function delay(milliseconds) {
-  return new Promise((resolve42) => setTimeout(resolve42, milliseconds));
+  return new Promise((resolve43) => setTimeout(resolve43, milliseconds));
 }
 async function persistCompletion(cacheDirectory, remainingRecords, rejectedRecords) {
   for (let attempt = 0; attempt < COMPLETION_RETRIES; attempt += 1) {
@@ -59678,7 +60869,7 @@ function runtimeMetadata(appVersion, input2 = {}) {
 init_loader2();
 init_user_config();
 function resolveFrom(baseDirectory, value) {
-  return isAbsolute16(value) ? value : resolve38(baseDirectory, value);
+  return isAbsolute17(value) ? value : resolve39(baseDirectory, value);
 }
 function findProjectConfig(cwd, customPath) {
   if (customPath !== void 0) {
@@ -59723,7 +60914,7 @@ async function readUserTelemetrySetting(configPath) {
   }
 }
 async function resolveCliTelemetryConfig(options = {}) {
-  const cwd = options.cwd === void 0 ? process.cwd() : resolve38(process.cwd(), options.cwd);
+  const cwd = options.cwd === void 0 ? process.cwd() : resolve39(process.cwd(), options.cwd);
   const userSetting = await readUserTelemetrySetting(options.userConfigPath ?? USER_CONFIG_PATH);
   const projectPath = findProjectConfig(cwd, options.config);
   const environmentConfig = process.env["PROMPTSCRIPT_CONFIG"];
@@ -59937,13 +61128,41 @@ import {
   chmod,
   open as open4,
   lstat as lstat11,
-  stat as stat3
-} from "fs/promises";
-import { resolve as resolve39, join as join30, basename as basename18, dirname as dirname23 } from "path";
-import { existsSync as existsSync31 } from "fs";
-import { tmpdir as tmpdir3 } from "os";
+  stat as stat3,
+  cp,
+  mkdir as mkdir11
+} from "node:fs/promises";
+import { resolve as resolve40, join as join30, basename as basename18, dirname as dirname23, relative as relative20, isAbsolute as isAbsolute18, sep as sep13 } from "node:path";
+import { existsSync as existsSync31 } from "node:fs";
+import { tmpdir as tmpdir3, homedir as homedir9 } from "node:os";
 import { parse as parseYaml15, stringify as stringifyYaml4 } from "yaml";
 var REMOTE_SOURCE_PATTERN = /^[a-zA-Z0-9][\w.-]*\.[a-zA-Z]{2,}\/.+/;
+var MANAGED_SKILLS_DIR = join30(".promptscript", "skills");
+var USE_PATH_PATTERN = /^\.{1,2}\/[a-zA-Z0-9_/.-]+$/;
+function expandHomePath(input2) {
+  if (input2 === "~") return homedir9();
+  if (input2.startsWith("~/") || input2.startsWith("~\\")) {
+    return join30(homedir9(), input2.slice(2));
+  }
+  return input2;
+}
+function isLocalSkillSource(source) {
+  const trimmed = source.trim();
+  if (trimmed.length === 0) return false;
+  if (trimmed.startsWith("~")) {
+    return trimmed === "~" || trimmed.slice(1, 2) === "/" || trimmed.slice(1, 2) === "\\";
+  }
+  if (trimmed.startsWith("/") || trimmed.startsWith("\\")) return true;
+  if (/^[a-zA-Z]:[\\/]/.test(trimmed)) return true;
+  if (trimmed.startsWith("./") || trimmed.startsWith(".\\")) return true;
+  if (trimmed.startsWith("../") || trimmed.startsWith("..\\")) return true;
+  if (REMOTE_SOURCE_PATTERN.test(trimmed)) return false;
+  return existsSync31(resolve40(process.cwd(), expandHomePath(trimmed)));
+}
+function toUsePath(entryDir, skillDir) {
+  const rel = relative20(entryDir, skillDir).split(sep13).join("/");
+  return rel.startsWith("..") ? rel : `./${rel}`;
+}
 function parseSkillSource(source) {
   const versionSeparator = source.lastIndexOf("@");
   if (versionSeparator === -1) {
@@ -59962,7 +61181,7 @@ function toDependencyPin(dependency) {
     integrity: dependency.integrity
   };
 }
-function resolveSkillDependency(repoUrl, requestedVersions, existing, forceUpdate, gitUrl, timeout = DEFAULT_GIT_TIMEOUT_MS) {
+function resolveSkillDependency(repoUrl, requestedVersions, existing, forceUpdate, gitUrl, timeout = void 0) {
   return gitUrl ? resolveRemoteDependency(
     repoUrl,
     requestedVersions,
@@ -60006,32 +61225,32 @@ async function collectProjectRemoteImports(entryFile) {
   const projectRoot = process.cwd();
   const entryFiles = /* @__PURE__ */ new Set();
   if (entryFile) {
-    entryFiles.add(resolve39(entryFile));
+    entryFiles.add(resolve40(entryFile));
   }
   if (config) {
     if (config.input?.entry) {
-      entryFiles.add(resolve39(projectRoot, config.input.entry));
+      entryFiles.add(resolve40(projectRoot, config.input.entry));
     }
     for (const build of Object.values(config.builds ?? {})) {
       if (build.entry) {
-        entryFiles.add(resolve39(projectRoot, build.entry));
+        entryFiles.add(resolve40(projectRoot, build.entry));
       }
     }
-    const defaultEntry = resolve39(projectRoot, ".promptscript/project.prs");
+    const defaultEntry = resolve40(projectRoot, ".promptscript/project.prs");
     if (!config.input?.entry && (existsSync31(defaultEntry) || entryFiles.size === 0)) {
       entryFiles.add(defaultEntry);
     }
   } else if (!entryFile) {
-    const defaultEntry = resolve39(projectRoot, ".promptscript/project.prs");
+    const defaultEntry = resolve40(projectRoot, ".promptscript/project.prs");
     if (existsSync31(defaultEntry)) {
       entryFiles.add(defaultEntry);
     } else {
-      const promptscriptDir = resolve39(projectRoot, ".promptscript");
+      const promptscriptDir = resolve40(projectRoot, ".promptscript");
       if (existsSync31(promptscriptDir)) {
         const entries = await readdir9(promptscriptDir);
         const prsFiles = entries.filter((entry) => entry.endsWith(".prs"));
         if (prsFiles.length === 1) {
-          entryFiles.add(resolve39(promptscriptDir, prsFiles[0]));
+          entryFiles.add(resolve40(promptscriptDir, prsFiles[0]));
         }
       }
     }
@@ -60040,7 +61259,7 @@ async function collectProjectRemoteImports(entryFile) {
   for (const projectEntry of entryFiles) {
     imports.push(
       ...await collectRemoteImports(projectEntry, {
-        localPath: resolve39(projectRoot, ".promptscript"),
+        localPath: resolve40(projectRoot, ".promptscript"),
         registries: config?.registries,
         strict: true,
         deduplicate: false,
@@ -60086,6 +61305,10 @@ function extractSkillFilePath(source) {
   if (!subPath) return "SKILL.md";
   return subPath.toLowerCase().endsWith(".md") ? subPath : `${subPath}/SKILL.md`;
 }
+function getRemoteSkillDiagnosticPath(source) {
+  const sourcePath = parseSkillSource(source).path.replace(/^https?:\/\//i, "");
+  return sourcePath.toLowerCase().endsWith(".md") ? sourcePath : `${sourcePath}/SKILL.md`;
+}
 function deriveSkillFolderName(source) {
   const subPath = extractSubPath(source);
   if (!subPath) return basename18(parseSkillSource(source).path);
@@ -60112,13 +61335,15 @@ async function fetchAndValidateRemoteSkill(source, options) {
   const cloneDir = !skillFilePath.includes("/") ? join30(tmp, repoName) : tmp;
   try {
     const gitRegistry = createGitRegistry({
-      url: repoUrl,
-      timeout: DEFAULT_GIT_TIMEOUT_MS
+      url: repoUrl
     });
     const cloneRef = options.version === "latest" || /^[0-9a-f]{40}$/i.test(options.version) ? void 0 : options.version;
-    await gitRegistry.cloneAtTag(repoUrl, cloneRef, cloneDir);
-    await gitRegistry.checkoutCommit(cloneDir, options.commit);
     const subPath = extractSubPath(source);
+    const isMdSource = subPath.toLowerCase().endsWith(".md");
+    const coneCandidate = isMdSource ? subPath.slice(0, subPath.lastIndexOf("/")) : subPath;
+    const sparseCone = coneCandidate.length > 0 ? coneCandidate : void 0;
+    await gitRegistry.cloneAtTag(repoUrl, cloneRef, cloneDir, void 0, sparseCone);
+    await gitRegistry.checkoutCommit(cloneDir, options.commit);
     if (!subPath.toLowerCase().endsWith(".md") && existsSync31(join30(cloneDir, `${subPath}.prs`))) {
       return {
         content: "",
@@ -60159,7 +61384,16 @@ async function fetchAndValidateRemoteSkill(source, options) {
       filePath,
       existingNames: options.existingNames
     });
-    return { content, integrity, valid: result.valid, issues: result.issues };
+    const diagnosticPath = getRemoteSkillDiagnosticPath(source);
+    const remoteSkillDir = dirname23(diagnosticPath);
+    const issues = result.issues.map((issue) => {
+      const message = issue.message.replaceAll(dirname23(filePath), remoteSkillDir);
+      if (issue.location) {
+        return { ...issue, message, location: { ...issue.location, file: diagnosticPath } };
+      }
+      return { ...issue, message };
+    });
+    return { content, integrity, valid: result.valid, issues };
   } finally {
     await rm2(tmp, { recursive: true, force: true }).catch(() => {
     });
@@ -60225,7 +61459,7 @@ async function isStaleSkillsAddLock(lockPath) {
   }
 }
 async function acquireSkillsAddLock() {
-  const lockPath = resolve39(SKILLS_ADD_LOCK_PATH);
+  const lockPath = resolve40(SKILLS_ADD_LOCK_PATH);
   for (let attempt = 0; attempt < 2; attempt++) {
     try {
       const file = await open4(lockPath, "wx", 384);
@@ -60266,7 +61500,7 @@ async function acquireSkillsAddLock() {
       await rm2(quarantinePath, { force: true });
     }
   }
-  throw new Error(`Cannot acquire skills add lock: ${resolve39(SKILLS_ADD_LOCK_PATH)}`);
+  throw new Error(`Cannot acquire skills add lock: ${resolve40(SKILLS_ADD_LOCK_PATH)}`);
 }
 async function releaseSkillsAddLock(lock) {
   try {
@@ -60316,7 +61550,7 @@ function validateRemoteSource(source) {
 }
 async function resolveEntryFile(fileFlag) {
   if (fileFlag) {
-    const resolved = resolve39(fileFlag);
+    const resolved = resolve40(fileFlag);
     if (!existsSync31(resolved)) {
       throw new Error(`File not found: ${resolved}`);
     }
@@ -60327,7 +61561,7 @@ async function resolveEntryFile(fileFlag) {
     try {
       const config = await loadConfig();
       if (config.input?.entry) {
-        const entryPath = resolve39(config.input.entry);
+        const entryPath = resolve40(config.input.entry);
         if (existsSync31(entryPath)) {
           return entryPath;
         }
@@ -60335,16 +61569,16 @@ async function resolveEntryFile(fileFlag) {
     } catch {
     }
   }
-  const promptscriptDir = resolve39(".promptscript");
+  const promptscriptDir = resolve40(".promptscript");
   if (existsSync31(promptscriptDir)) {
     const entries = await readdir9(promptscriptDir);
     const prsFiles = entries.filter((f) => f.endsWith(".prs"));
     if (prsFiles.length === 1) {
-      return resolve39(promptscriptDir, prsFiles[0]);
+      return resolve40(promptscriptDir, prsFiles[0]);
     }
     if (prsFiles.length > 1) {
       if (prsFiles.includes("project.prs")) {
-        return resolve39(promptscriptDir, "project.prs");
+        return resolve40(promptscriptDir, "project.prs");
       }
       throw new Error(
         `Multiple .prs files found in .promptscript/. Use --file to specify which one.`
@@ -60570,6 +61804,306 @@ async function rollbackSkillsAdd(state) {
   }
   return new Error(rollbackErrors.map((error) => error.message).join("; "));
 }
+function failLocalSkillStep(spinner, step) {
+  spinner.fail(step.message);
+  if (step.hint) {
+    ConsoleOutput.error(step.hint);
+  }
+  process.exitCode = 1;
+}
+async function scanManagedSkillNames(managedRoot, skillDir) {
+  if (!existsSync31(managedRoot)) return [];
+  const entries = await readdir9(managedRoot, { withFileTypes: true });
+  const names = [];
+  for (const entry of entries) {
+    if (!entry.isDirectory()) continue;
+    if (resolve40(managedRoot, entry.name) === resolve40(skillDir)) continue;
+    names.push(entry.name);
+  }
+  return names;
+}
+function collectLocalUseNames(lines, skillDir, entryDir) {
+  const names = [];
+  for (const line of lines) {
+    const usePath = extractUsePath(line);
+    if (!usePath || !(usePath.startsWith("./") || usePath.startsWith("../"))) continue;
+    const absUsePath = resolve40(entryDir, usePath);
+    const dir = usePath.endsWith(".md") ? dirname23(absUsePath) : absUsePath;
+    if (dir === resolve40(skillDir)) continue;
+    names.push(basename18(dir));
+  }
+  return names;
+}
+async function collectLocalExistingNames(lockfile, lines, skillDir, entryDir) {
+  const names = new Set(collectExistingSkillNames(lockfile));
+  const managedRoot = resolve40(process.cwd(), MANAGED_SKILLS_DIR);
+  for (const name of await scanManagedSkillNames(managedRoot, skillDir)) {
+    names.add(name);
+  }
+  for (const name of collectLocalUseNames(lines, skillDir, entryDir)) {
+    names.add(name);
+  }
+  return names;
+}
+async function classifyLocalSkillSource(expanded, copyRequested) {
+  const absSource = resolve40(process.cwd(), expanded);
+  if (!existsSync31(absSource)) {
+    return { ok: false, message: `Path not found: ${expanded}` };
+  }
+  const lstatDetails = await lstat11(absSource);
+  if (lstatDetails.isSymbolicLink() && !copyRequested) {
+    return {
+      ok: false,
+      message: "Symbolic-linked skill directories are not supported",
+      hint: "The resolver skips symlinked directories at compile time. Use --copy to install the skill files."
+    };
+  }
+  const details = lstatDetails.isSymbolicLink() ? await stat3(absSource) : lstatDetails;
+  if (details.isFile()) {
+    if (!absSource.toLowerCase().endsWith(".md")) {
+      return {
+        ok: false,
+        message: `Not a SKILL.md: ${expanded}`,
+        hint: "A local file source must be a SKILL.md, or the directory holding it."
+      };
+    }
+    return { ok: true, value: { skillMdPath: absSource, skillDir: dirname23(absSource) } };
+  }
+  if (details.isDirectory()) {
+    const skillMdPath = join30(absSource, "SKILL.md");
+    if (!existsSync31(skillMdPath)) {
+      return {
+        ok: false,
+        message: `No SKILL.md found in: ${expanded}`,
+        hint: "A skill directory must contain a SKILL.md file."
+      };
+    }
+    return { ok: true, value: { skillMdPath, skillDir: absSource } };
+  }
+  return { ok: false, message: `Unsupported file type: ${expanded}` };
+}
+function planLocalUsePath(skillDir, entryDir, copyRequested) {
+  const skillName = basename18(skillDir);
+  const managedDir = resolve40(process.cwd(), MANAGED_SKILLS_DIR, skillName);
+  const sourceIsManaged = resolve40(skillDir) === resolve40(managedDir);
+  const willCopy = copyRequested && !sourceIsManaged;
+  if (willCopy) {
+    return { ok: true, value: { usePath: toUsePath(entryDir, managedDir), managedDir, willCopy } };
+  }
+  const relToRoot = relative20(process.cwd(), skillDir);
+  if (relToRoot.startsWith("..") || isAbsolute18(relToRoot)) {
+    return {
+      ok: false,
+      message: "Skill is outside the project root",
+      hint: `"${skillDir}" cannot be referenced in place because it lies outside the project root. Use --copy to install it into ${MANAGED_SKILLS_DIR}/.`
+    };
+  }
+  const usePath = toUsePath(entryDir, skillDir);
+  if (!USE_PATH_PATTERN.test(usePath)) {
+    return {
+      ok: false,
+      message: `Cannot reference this path in a .prs file: ${usePath}`,
+      hint: "@use paths allow only letters, digits, underscores, hyphens, dots and slashes. Use --copy to install the skill under .promptscript/skills/, or rename the folder."
+    };
+  }
+  return { ok: true, value: { usePath, managedDir, willCopy } };
+}
+function validateLocalSkillFrontmatter(options, skillMdPath, skillContent, existingNames, usePath, spinner) {
+  if (options.skipValidation) return "pass";
+  const result = validateSkillFrontmatter(skillContent, { filePath: skillMdPath, existingNames });
+  const hasWarnings = result.issues.some((issue) => issue.severity === "warning");
+  if (!result.valid || options.strict && hasWarnings) {
+    spinner.fail("SKILL.md failed validation");
+    ConsoleOutput.error(usePath);
+    printValidationIssues(result.issues);
+    return "fail";
+  }
+  if (hasWarnings) {
+    spinner.warn("SKILL.md has validation warnings");
+    printValidationIssues(result.issues);
+    spinner.start("Adding skill...");
+  }
+  return "pass";
+}
+async function commitLocalSkillAdd(plan, spinner) {
+  spinner.text = plan.willCopy ? "Copying skill..." : "Adding skill...";
+  let replacedBackupDir;
+  let copyStarted = false;
+  try {
+    if (plan.willCopy) {
+      await mkdir11(dirname23(plan.managedDir), { recursive: true });
+      if (existsSync31(plan.managedDir)) {
+        replacedBackupDir = `${plan.managedDir}.replaced-${process.pid}-${Date.now()}`;
+        await rename3(plan.managedDir, replacedBackupDir);
+      }
+      copyStarted = true;
+      await cp(plan.skillDir, plan.managedDir, { recursive: true, dereference: true });
+    }
+    await assertFileUnchanged(plan.entryFile, plan.originalEntryContent);
+    await writeFileAtomically(plan.entryFile, plan.updatedEntryContent);
+  } catch (error) {
+    if (copyStarted) {
+      await rm2(plan.managedDir, { recursive: true, force: true }).catch(() => {
+      });
+    }
+    if (replacedBackupDir) {
+      await rename3(replacedBackupDir, plan.managedDir).catch(() => {
+      });
+    }
+    throw error;
+  }
+  if (replacedBackupDir) {
+    await rm2(replacedBackupDir, { recursive: true, force: true }).catch(() => {
+    });
+  }
+}
+function checkSkillNameCollision(skillName, willCopy, force, existingNames) {
+  if (existingNames.has(skillName) && willCopy && !force) {
+    return `Skill "${skillName}" already exists in this project`;
+  }
+  if (force) {
+    existingNames.delete(skillName);
+  }
+  return void 0;
+}
+async function prepareLocalSkillAdd(expanded, options) {
+  const parsed = parseSkillSource(expanded);
+  if (parsed.version !== "latest") {
+    return {
+      ok: false,
+      message: "Versioned local paths are not supported",
+      hint: "Local skills are referenced in place, so there is no version to pin."
+    };
+  }
+  const classified = await classifyLocalSkillSource(expanded, options.copy === true);
+  if (!classified.ok) {
+    return classified;
+  }
+  const { skillDir, skillMdPath } = classified.value;
+  const entryFile = await resolveEntryFile(options.file);
+  const originalEntryContent = await readFile30(entryFile, "utf-8");
+  const plan = planLocalUsePath(skillDir, dirname23(entryFile), options.copy === true);
+  if (!plan.ok) {
+    return plan;
+  }
+  return {
+    ok: true,
+    value: {
+      skillMdPath,
+      skillDir,
+      skillName: basename18(skillDir),
+      entryFile,
+      entryDir: dirname23(entryFile),
+      originalEntryContent,
+      usePath: plan.value.usePath,
+      managedDir: plan.value.managedDir,
+      willCopy: plan.value.willCopy
+    }
+  };
+}
+function printLocalSkillDryRun(ctx, newLine, spinner) {
+  spinner.succeed("Dry run \u2014 no files modified");
+  ConsoleOutput.newline();
+  ConsoleOutput.dryRun(`Would add to ${ctx.entryFile}:`);
+  ConsoleOutput.dryRun(`  ${newLine}`);
+  if (ctx.willCopy) {
+    ConsoleOutput.dryRun(`Would copy ${ctx.skillDir} \u2192 ${ctx.managedDir}`);
+  }
+  ConsoleOutput.dryRun("No lockfile entry (local skills are not pinned)");
+}
+function reportLocalSkillAdded(ctx, newLine, spinner) {
+  spinner.succeed("Skill added");
+  ConsoleOutput.newline();
+  ConsoleOutput.success(`${newLine}  \u2192  ${ctx.entryFile}`);
+  if (ctx.willCopy) {
+    ConsoleOutput.muted(`Copied into ${MANAGED_SKILLS_DIR}/${ctx.skillName}`);
+  }
+  ConsoleOutput.muted("Local skill - not recorded in the lockfile");
+}
+function reportLocalSkillError(error, spinner) {
+  spinner.fail("Failed to add skill");
+  ConsoleOutput.error(error instanceof Error ? error.message : String(error));
+  process.exitCode = 1;
+}
+async function addLocalSkill(rawSource, options, spinner) {
+  let transactionLock;
+  try {
+    if (!options.dryRun) {
+      transactionLock = await acquireSkillsAddLock();
+    }
+    spinner.text = "Resolving skill source...";
+    const prepared = await prepareLocalSkillAdd(expandHomePath(rawSource.trim()), options);
+    if (!prepared.ok) {
+      failLocalSkillStep(spinner, prepared);
+      return;
+    }
+    const ctx = prepared.value;
+    const lines = ctx.originalEntryContent.split("\n");
+    const alreadyImported = lines.some((line) => extractUsePath(line) === ctx.usePath);
+    if (alreadyImported) {
+      spinner.warn(`Skill already imported: ${ctx.usePath}`);
+      return;
+    }
+    const lockfile = await loadLockfile3();
+    const existingNames = await collectLocalExistingNames(
+      lockfile,
+      lines,
+      ctx.skillDir,
+      ctx.entryDir
+    );
+    const refusal = checkSkillNameCollision(
+      ctx.skillName,
+      ctx.willCopy,
+      options.force === true,
+      existingNames
+    );
+    if (refusal) {
+      spinner.fail(refusal);
+      ConsoleOutput.error("Use --force to replace it.");
+      process.exitCode = 1;
+      return;
+    }
+    spinner.text = options.skipValidation ? "Reading SKILL.md..." : "Validating SKILL.md...";
+    const skillContent = await readFile30(ctx.skillMdPath, "utf-8");
+    const validationOutcome = validateLocalSkillFrontmatter(
+      options,
+      ctx.skillMdPath,
+      skillContent,
+      existingNames,
+      ctx.usePath,
+      spinner
+    );
+    if (validationOutcome === "fail") {
+      process.exitCode = 1;
+      return;
+    }
+    const insertionPoint = findInsertionPoint(lines);
+    const newLine = `@use ${ctx.usePath}`;
+    lines.splice(insertionPoint, 0, newLine);
+    if (options.dryRun) {
+      printLocalSkillDryRun(ctx, newLine, spinner);
+      return;
+    }
+    await commitLocalSkillAdd(
+      {
+        entryFile: ctx.entryFile,
+        originalEntryContent: ctx.originalEntryContent,
+        updatedEntryContent: lines.join("\n"),
+        willCopy: ctx.willCopy,
+        skillDir: ctx.skillDir,
+        managedDir: ctx.managedDir
+      },
+      spinner
+    );
+    reportLocalSkillAdded(ctx, newLine, spinner);
+  } catch (error) {
+    reportLocalSkillError(error, spinner);
+  } finally {
+    if (transactionLock) {
+      await releaseSkillsAddLock(transactionLock);
+    }
+  }
+}
 async function skillsAddCommand(rawSource, options) {
   const spinner = createSpinner("Adding skill...").start();
   let rollbackState;
@@ -60583,6 +62117,10 @@ async function skillsAddCommand(rawSource, options) {
       process.exitCode = 1;
       return;
     }
+    if (isLocalSkillSource(rawSource)) {
+      await addLocalSkill(rawSource, options, spinner);
+      return;
+    }
     const sshCloneUrl = extractSshCloneUrl(rawSource);
     const source = normalizeSkillSource(rawSource);
     const sourceError = validateRemoteSource(source);
@@ -61052,6 +62590,8 @@ var __filename4 = fileURLToPath4(import.meta.url);
 var __dirname4 = dirname28(__filename4);
 var CLI_VERSION = getPackageVersion(__dirname3, "./package.json");
 var program = new Command();
+var RESOURCES_FLAG = "--resources <items>";
+var RESOURCES_DESCRIPTION = "Compile only these resources (agents, skills, commands, mcp, hooks, plugins, main)";
 program.name("prs").description("PromptScript CLI - Standardize AI instructions").version(CLI_VERSION).option("--verbose", "Enable verbose output").option("--debug", "Enable debug output (includes verbose)").option("--quiet", "Suppress non-error output").hook("preAction", async (thisCommand, actionCommand) => {
   if (actionCommand.name() === "__telemetry-flush" && process.env["PROMPTSCRIPT_TELEMETRY_FLUSH"] === "1") {
     return;
@@ -61088,11 +62628,11 @@ program.command("init").description("Initialize PromptScript in current director
   }
   return initCommand(opts);
 });
-program.command("compile").description("Compile PromptScript to target formats").option("-b, --build <name>", "Named build profile from config.builds").option("--all-builds", "Compile all named build profiles in deterministic order").option("-t, --target <target>", "Specific target (github, claude, cursor)").option("-f, --format <format>", "Output format (alias for --target)").option("-a, --all", "All configured targets").option("-w, --watch", "Watch mode").option("-o, --output <dir>", "Output directory").option("--dry-run", "Preview changes").option(
+program.command("compile").description("Compile PromptScript to target formats").option("-b, --build <name>", "Named build profile from config.builds").option("--all-builds", "Compile all named build profiles in deterministic order").option("-t, --target <target>", "Specific target (github, claude, cursor)").option("-f, --format <format>", "Output format (alias for --target)").option("-a, --all", "All configured targets").option("-w, --watch", "Watch mode").option("-o, --output <dir>", "Output directory").option(RESOURCES_FLAG, RESOURCES_DESCRIPTION, collectResourceKinds, []).option("--dry-run", "Preview changes").option(
   "--no-migrate-factory-hooks",
   "Warn instead of migrating legacy .factory/settings.json hooks"
 ).option("--registry <path>", "Registry path (overrides config)").option("-c, --config <path>", "Path to custom config file").option("--force", "Force overwrite existing files without prompts").option("--strict", "Treat output path conflicts as errors").option("--ignore-hashes", "Skip reference integrity hash verification").option("--cwd <dir>", "Working directory (project root)").action((opts) => compileCommand(opts));
-program.command("build <name>").description("Compile a named build profile").option("-t, --target <target>", "Specific target (github, claude, cursor)").option("-f, --format <format>", "Output format (alias for --target)").option("-w, --watch", "Watch mode").option("-o, --output <dir>", "Output directory").option("--dry-run", "Preview changes").option(
+program.command("build <name>").description("Compile a named build profile").option("-t, --target <target>", "Specific target (github, claude, cursor)").option("-f, --format <format>", "Output format (alias for --target)").option("-w, --watch", "Watch mode").option("-o, --output <dir>", "Output directory").option(RESOURCES_FLAG, RESOURCES_DESCRIPTION, collectResourceKinds, []).option("--dry-run", "Preview changes").option(
   "--no-migrate-factory-hooks",
   "Warn instead of migrating legacy .factory/settings.json hooks"
 ).option("--registry <path>", "Registry path (overrides config)").option("-c, --config <path>", "Path to custom config file").option("--force", "Force overwrite existing files without prompts").option("--strict", "Treat output path conflicts as errors").option("--ignore-hashes", "Skip reference integrity hash verification").option("--cwd <dir>", "Working directory (project root)").action((name, opts) => compileCommand({ ...opts, build: name }));
@@ -61124,7 +62664,10 @@ program.command("resolve <import>").description("Show the lock pin and local sou
 program.command("hook").argument("<action>", "Hook action: pre-edit or post-edit").description("Hook handler invoked by AI tools (not for direct use)").action(hookCommand);
 program.command("hooks").argument("<action>", "Action: install or uninstall").argument("[tool]", "Tool: claude, gemini, copilot, cursor, windsurf, factory, cline").option("--all", "Install/uninstall for all detected tools").description("Manage PromptScript hooks for AI tools").action(hooksCommand);
 var skills = program.command("skills").description("Manage PromptScript skills");
-skills.command("add <source>").description("Add a remote skill to the project").option("-f, --file <file>", "Target .prs file to modify").option("--dry-run", "Preview changes without writing").option("--skip-validation", "Skip SKILL.md frontmatter validation (not recommended)").option("--strict", "Treat validation warnings as errors").action((source, opts) => skillsAddCommand(source, opts));
+skills.command("add <source>").description("Add a remote or local skill to the project").option("-f, --file <file>", "Target .prs file to modify").option("--dry-run", "Preview changes without writing").option("--skip-validation", "Skip SKILL.md frontmatter validation (not recommended)").option("--strict", "Treat validation warnings as errors").option(
+  "--copy",
+  "Local sources: copy into .promptscript/skills/ instead of referencing in place"
+).option("--force", "Local sources: replace an existing skill with the same name").action((source, opts) => skillsAddCommand(source, opts));
 skills.command("remove <name>").description("Remove a skill from the project").option("--dry-run", "Preview changes without writing").action((name, opts) => skillsRemoveCommand(name, opts));
 skills.command("list").description("List skills imported in the current project").action(() => skillsListCommand());
 skills.command("update [name]").description("Update lock entries for markdown-sourced skills").option("--dry-run", "Preview changes without writing").option("--skip-validation", "Skip SKILL.md frontmatter validation (not recommended)").option("--strict", "Treat validation warnings as errors").action((name, opts) => skillsUpdateCommand(name, opts));