pk-agent 0.7.4 → 0.7.5

package/dist/index.js

@@ -1471,10 +1471,26 @@ function safeMkdir(dir) {
     mkdirSync(dir, { recursive: true });
   } catch {}
 }
+function getUserAgentsDir(home = homedir()) {
+  return join(home, ".agents", "pk-agents");
+}
+function getUserSkillsDir(home = homedir()) {
+  return join(home, ".agents", "skills");
+}
+function getProjectAgentsDir(projectRoot) {
+  return join(projectRoot, ".agents", "pk-agents");
+}
+function getProjectSkillsDir(projectRoot) {
+  return join(projectRoot, ".agents", "skills");
+}
 function ensurePkAgentUserDirs(opts) {
   const home = opts?.homeDir ?? homedir();
   const base = join(home, ".pk-agent");
+  const agentsBase = join(home, ".agents");
   safeMkdir(base);
+  safeMkdir(agentsBase);
+  safeMkdir(join(agentsBase, "pk-agents"));
+  safeMkdir(join(agentsBase, "skills"));
   safeMkdir(join(base, "agents"));
   safeMkdir(join(base, "skills"));
   safeMkdir(join(base, "plugins"));
@@ -1484,7 +1500,11 @@ function ensurePkAgentUserDirs(opts) {
 }
 function ensurePkAgentProjectDirs(projectRoot) {
   const base = join(projectRoot, ".pk-agent");
+  const agentsBase = join(projectRoot, ".agents");
   safeMkdir(base);
+  safeMkdir(agentsBase);
+  safeMkdir(join(agentsBase, "pk-agents"));
+  safeMkdir(join(agentsBase, "skills"));
   safeMkdir(join(base, "agents"));
   safeMkdir(join(base, "skills"));
   safeMkdir(join(base, "plugins"));
@@ -5048,10 +5068,10 @@ function buildFallbackCore(intent) {
 }
 function resolveOutputPath(params) {
   if (params.kind === "project") {
-    return path10.resolve(params.projectRoot, ".pk-agent", "agents", `${params.filename}.pk-agent`);
+    return path10.resolve(params.projectRoot, ".agents", "pk-agents", `${params.filename}.pk-agent`);
   }
   if (params.kind === "user") {
-    return path10.resolve(homedir7(), ".pk-agent", "agents", `${params.filename}.pk-agent`);
+    return path10.resolve(homedir7(), ".agents", "pk-agents", `${params.filename}.pk-agent`);
   }
   if (!params.customPath)
     throw new Error("custom location requires path");
@@ -5577,7 +5597,7 @@ var init_parser2 = __esm(() => {
 });
 
 // package.json
-var version = "0.7.4";
+var version = "0.7.5";
 var init_package = () => {};
 
 // src/storage/storage.ts
@@ -6342,8 +6362,9 @@ import { access as access3 } from "fs/promises";
 function getDiscoveryDirectories(projectRoot) {
   const home = homedir10();
   return [
-    join6(projectRoot, ".pk-agent", "skills"),
     join6(projectRoot, ".agents", "skills"),
+    join6(projectRoot, ".pk-agent", "skills"),
+    join6(home, ".agents", "skills"),
     join6(projectRoot, ".claude", "skills"),
     join6(projectRoot, ".claude", "plugins"),
     join6(home, ".pk-agent", "skills"),
@@ -9574,9 +9595,10 @@ function getAgentDiscoveryDirectories(projectRoot, agentDir) {
   if (agentDir) {
     dirs.push(agentDir);
   }
+  dirs.push(join13(projectRoot, ".agents", "pk-agents"));
   dirs.push(join13(projectRoot, ".pk-agent", "agents"));
-  dirs.push(join13(projectRoot, ".agents", "agents"));
   dirs.push(join13(projectRoot, ".claude", "agents"));
+  dirs.push(join13(home, ".agents", "pk-agents"));
   dirs.push(join13(home, ".pk-agent", "agents"));
   dirs.push(join13(home, ".claude", "agents"));
   return dirs;
@@ -9596,7 +9618,7 @@ async function discoverAgents(projectRoot, agentDir) {
   const agents = new Map;
   const directories = getAgentDiscoveryDirectories(projectRoot, agentDir);
   const ecosystemDirs = new Set([
-    join13(projectRoot, ".agents", "agents"),
+    join13(projectRoot, ".agents", "pk-agents"),
     join13(projectRoot, ".claude", "agents"),
     join13(homedir15(), ".claude", "agents")
   ]);
@@ -14448,9 +14470,12 @@ import { Command as Command5 } from "commander";
 import chalk5 from "chalk";
 import { homedir as homedir11 } from "os";
 import { join as join7 } from "path";
+init_pk_agent_dirs();
 function getSourceDir(location, projectRoot) {
   const home = homedir11();
   const dirs = [
+    { path: getProjectSkillsDir(projectRoot), label: ".agents/skills" },
+    { path: getUserSkillsDir(home), label: "~/.agents/skills" },
     { path: join7(projectRoot, ".pk-agent", "skills"), label: ".pk-agent/skills" },
     { path: join7(home, ".pk-agent", "skills"), label: "~/.pk-agent/skills" },
     { path: join7(projectRoot, ".claude", "skills"), label: ".claude/skills" },
@@ -14471,6 +14496,8 @@ function createSkillsCommand() {
       console.log(chalk5.gray("No skills found."));
       console.log(chalk5.gray(`
 Skill directories searched:`));
+      console.log(chalk5.gray("  .agents/skills/"));
+      console.log(chalk5.gray("  ~/.agents/skills/"));
       console.log(chalk5.gray("  .pk-agent/skills/"));
       console.log(chalk5.gray("  ~/.pk-agent/skills/"));
       console.log(chalk5.gray("  .claude/skills/"));
@@ -18259,9 +18286,10 @@ import { execSync } from "child_process";
 import { existsSync as existsSync11, rmSync as rmSync2, mkdirSync as mkdirSync6, cpSync, statSync as statSync2, readFileSync as readFileSync7 } from "fs";
 import { glob as glob5 } from "glob";
 import { join as join20, basename as basename5, dirname as dirname13, resolve as resolve18 } from "path";
-import { tmpdir as tmpdir6, homedir as homedir18 } from "os";
+import { tmpdir as tmpdir6 } from "os";
 import * as readline4 from "readline";
 import * as p from "@clack/prompts";
+init_pk_agent_dirs();
 function sanitizeSourceForTelemetry(source, type) {
   if (type === "local" || type === "skill") {
     return;
@@ -18419,7 +18447,7 @@ async function add(source, projectRoot, options = {}) {
   try {
     if (resolved.type === "skill") {
       const skillName = basename5(workDir);
-      const dest = options.skillDestRoot ? join20(options.skillDestRoot, skillName) : join20(projectRoot, ".pk-agent", "skills", skillName);
+      const dest = options.skillDestRoot ? join20(options.skillDestRoot, skillName) : join20(getProjectSkillsDir(projectRoot), skillName);
       const { action } = await copyWithConflictHandling(workDir, dest, "skill", skillName, conflictMode);
       result.skills.push({ name: skillName, action });
       return result;
@@ -18432,7 +18460,7 @@ async function add(source, projectRoot, options = {}) {
         continue;
       }
       const src = join20(workDir, skill.path);
-      const dest = options.skillDestRoot ? join20(options.skillDestRoot, skill.name) : join20(projectRoot, ".pk-agent", "skills", skill.name);
+      const dest = options.skillDestRoot ? join20(options.skillDestRoot, skill.name) : join20(getProjectSkillsDir(projectRoot), skill.name);
       const { action, newMode } = await copyWithConflictHandling(src, dest, "skill", skill.name, conflictMode);
       if (newMode)
         conflictMode = newMode;
@@ -18444,7 +18472,7 @@ async function add(source, projectRoot, options = {}) {
       }
       const src = join20(workDir, agent.path);
       const agentFileName = basename5(agent.path);
-      const dest = options.agentDestRoot ? join20(options.agentDestRoot, agentFileName) : join20(projectRoot, agent.path);
+      const dest = options.agentDestRoot ? join20(options.agentDestRoot, agentFileName) : join20(getProjectAgentsDir(projectRoot), agentFileName);
       const { action, newMode } = await copyWithConflictHandling(src, dest, "agent", agent.path, conflictMode);
       if (newMode)
         conflictMode = newMode;
@@ -18504,12 +18532,12 @@ function printSummary(result) {
 async function promptSelection(skills, agents, projectRoot) {
   const options = [];
   for (const s of skills) {
-    const exists = existsSync11(join20(projectRoot, ".pk-agent", "skills", s.name));
+    const exists = existsSync11(join20(getProjectSkillsDir(projectRoot), s.name));
     const marker = exists ? chalk8.yellow(" (exists)") : "";
     options.push({ value: `skill:${s.name}`, label: `${chalk8.blue("[skill]")} ${s.name}${marker}` });
   }
   for (const a of agents) {
-    const exists = existsSync11(join20(projectRoot, a.path));
+    const exists = existsSync11(join20(getProjectAgentsDir(projectRoot), basename5(a.path)));
     const marker = exists ? chalk8.yellow(" (exists)") : "";
     options.push({ value: `agent:${a.path}`, label: `${chalk8.magenta("[agent]")} ${a.path}${marker}` });
   }
@@ -18531,13 +18559,13 @@ async function promptSelection(skills, agents, projectRoot) {
   return { selectedSkills, selectedAgents };
 }
 function createAddCommand() {
-  const addCommand = new Command8("add").description("Add skills and agents from a GitHub repo, git URL, or local path").argument("<source>", "Source to add (user/repo, git URL, or local path)").option("--force", "Overwrite existing skills/agents without prompting").option("--all", "Install all skills and agents without prompting").option("--list", "List available skills and agents without installing").option("-s, --skill <name...>", "Install specific skill(s) by name").option("-a, --agent <path...>", "Install specific agent(s) by path").option("-u, --urlpath <path>", "Install into .pk-agent/ at this filepath instead of auto-detected project root").action(async (source, options) => {
+  const addCommand = new Command8("add").description("Add skills and agents from a GitHub repo, git URL, or local path").argument("<source>", "Source to add (user/repo, git URL, or local path)").option("--force", "Overwrite existing skills/agents without prompting").option("--all", "Install all skills and agents without prompting").option("--list", "List available skills and agents without installing").option("-s, --skill <name...>", "Install specific skill(s) by name").option("-a, --agent <path...>", "Install specific agent(s) by path").option("-u, --urlpath <path>", "Install into .agents/ at this filepath instead of auto-detected project root").action(async (source, options) => {
     const projectContext = resolveProjectContext(process.cwd());
     const startTime = Date.now();
     const effectiveRoot = options.urlpath ? resolve18(options.urlpath) : projectContext.projectRoot;
     if (options.urlpath) {
-      mkdirSync6(join20(effectiveRoot, ".pk-agent", "skills"), { recursive: true });
-      mkdirSync6(join20(effectiveRoot, ".pk-agent", "agents"), { recursive: true });
+      mkdirSync6(getProjectSkillsDir(effectiveRoot), { recursive: true });
+      mkdirSync6(getProjectAgentsDir(effectiveRoot), { recursive: true });
     }
     let telemetryData = {
       sourceType: "github",
@@ -18579,11 +18607,11 @@ function createAddCommand() {
         if (resolved.type === "skill") {
           let skillDestRoot2;
           if (options.urlpath) {
-            skillDestRoot2 = join20(effectiveRoot, ".pk-agent", "skills");
+            skillDestRoot2 = getProjectSkillsDir(effectiveRoot);
           } else {
             const storageOptions = [
-              { value: "project", label: "Project", hint: `.pk-agent/skills/ in project root` },
-              { value: "user", label: "User", hint: `~/.pk-agent/skills/ (available globally)` },
+              { value: "project", label: "Project", hint: `.agents/skills/ in project root` },
+              { value: "user", label: "User", hint: `~/.agents/skills/ (available globally)` },
               { value: "cancel", label: "Cancel" }
             ];
             const location = await p.select({
@@ -18596,7 +18624,7 @@ function createAddCommand() {
               p.outro("Cancelled");
               return;
             }
-            skillDestRoot2 = location === "user" ? join20(homedir18(), ".pk-agent", "skills") : join20(effectiveRoot, ".pk-agent", "skills");
+            skillDestRoot2 = location === "user" ? getUserSkillsDir() : getProjectSkillsDir(effectiveRoot);
           }
           const result2 = await add(source, effectiveRoot, {
             force: options.force ?? false,
@@ -18623,7 +18651,7 @@ function createAddCommand() {
         if (options.list) {
           if (skills.length > 0) {
             const skillLines = skills.map((skill) => {
-              const exists = existsSync11(join20(effectiveRoot, ".pk-agent", "skills", skill.name));
+              const exists = existsSync11(join20(getProjectSkillsDir(effectiveRoot), skill.name));
               const marker = exists ? chalk8.yellow(" (exists)") : "";
               const desc = skill.description ? `
     ${chalk8.gray(skill.description)}` : "";
@@ -18635,7 +18663,7 @@ ${skillLines.join(`
           }
           if (agents.length > 0) {
             const agentLines = agents.map((agent) => {
-              const exists = existsSync11(join20(effectiveRoot, agent.path));
+              const exists = existsSync11(join20(getProjectAgentsDir(effectiveRoot), basename5(agent.path)));
               const marker = exists ? chalk8.yellow(" (exists)") : "";
               return `  ${chalk8.cyan(agent.path)}${marker}`;
             });
@@ -18692,16 +18720,16 @@ ${agentLines.join(`
         const hasAgentsToInstall = selectedAgents ? selectedAgents.length > 0 : agents.length > 0;
         if (options.urlpath) {
           if (hasSkillsToInstall) {
-            skillDestRoot = join20(effectiveRoot, ".pk-agent", "skills");
+            skillDestRoot = getProjectSkillsDir(effectiveRoot);
           }
           if (hasAgentsToInstall) {
-            agentDestRoot = join20(effectiveRoot, ".pk-agent", "agents");
+            agentDestRoot = getProjectAgentsDir(effectiveRoot);
           }
         } else {
           if (hasSkillsToInstall) {
             const storageOptions = [
-              { value: "project", label: "Project", hint: `.pk-agent/skills/ in project root` },
-              { value: "user", label: "User", hint: `~/.pk-agent/skills/ (available globally)` },
+              { value: "project", label: "Project", hint: `.agents/skills/ in project root` },
+              { value: "user", label: "User", hint: `~/.agents/skills/ (available globally)` },
               { value: "cancel", label: "Cancel" }
             ];
             const location = await p.select({
@@ -18715,15 +18743,15 @@ ${agentLines.join(`
               return;
             }
             if (location === "project") {
-              skillDestRoot = join20(effectiveRoot, ".pk-agent", "skills");
+              skillDestRoot = getProjectSkillsDir(effectiveRoot);
             } else if (location === "user") {
-              skillDestRoot = join20(homedir18(), ".pk-agent", "skills");
+              skillDestRoot = getUserSkillsDir();
             }
           }
           if (hasAgentsToInstall) {
             const storageOptions = [
-              { value: "project", label: "Project", hint: `.pk-agent/agents/ in project root` },
-              ...effectiveRoot ? [{ value: "user", label: "User", hint: `~/.pk-agent/agents/ (available globally)` }] : [],
+              { value: "project", label: "Project", hint: `.agents/pk-agents/ in project root` },
+              ...effectiveRoot ? [{ value: "user", label: "User", hint: `~/.agents/pk-agents/ (available globally)` }] : [],
               { value: "cancel", label: "Cancel" }
             ];
             const location = await p.select({
@@ -18737,9 +18765,9 @@ ${agentLines.join(`
               return;
             }
             if (location === "project") {
-              agentDestRoot = join20(effectiveRoot, ".pk-agent", "agents");
+              agentDestRoot = getProjectAgentsDir(effectiveRoot);
             } else if (location === "user") {
-              agentDestRoot = join20(homedir18(), ".pk-agent", "agents");
+              agentDestRoot = getUserAgentsDir();
             }
           }
         }
@@ -18791,7 +18819,6 @@ import * as p2 from "@clack/prompts";
 import matter4 from "gray-matter";
 import { writeFileSync as writeFileSync5, mkdirSync as mkdirSync7, existsSync as existsSync12 } from "fs";
 import { join as join21, resolve as resolve19 } from "path";
-import { homedir as homedir19 } from "os";
 init_pk_agent_dirs();
 var DEFAULTS = {
   model: "anthropic:claude-sonnet-4-5",
@@ -18995,8 +19022,8 @@ function createCreateCommand() {
     const locResult = await p2.select({
       message: "Where should the agent be saved?",
       options: [
-        { value: "project", label: "Project", hint: `${projectRoot}/.pk-agent/agents/` },
-        { value: "user", label: "User (global)", hint: "~/.pk-agent/agents/" },
+        { value: "project", label: "Project", hint: `${getProjectAgentsDir(projectRoot)}/` },
+        { value: "user", label: "User (global)", hint: `${getUserAgentsDir()}/` },
         { value: "custom", label: "Custom path" },
         { value: "cancel", label: "Cancel" }
       ]
@@ -19007,9 +19034,9 @@ function createCreateCommand() {
     }
     let destDir;
     if (locResult === "project") {
-      destDir = join21(projectRoot, ".pk-agent", "agents");
+      destDir = getProjectAgentsDir(projectRoot);
     } else if (locResult === "user") {
-      destDir = join21(homedir19(), ".pk-agent", "agents");
+      destDir = getUserAgentsDir();
     } else {
       const pathResult = await p2.text({
         message: "Directory path",
@@ -19067,7 +19094,7 @@ import { basename as basename6, resolve as resolve20, dirname as dirname15 } fro
 // src/plugin/index.ts
 init_logger();
 import { glob as glob6 } from "glob";
-import { homedir as homedir20, tmpdir as tmpdir7 } from "os";
+import { homedir as homedir18, tmpdir as tmpdir7 } from "os";
 import { join as join22, dirname as dirname14, extname } from "path";
 import { pathToFileURL } from "url";
 import { stat as stat2, writeFile as writeFile7, rm as rm2 } from "fs/promises";
@@ -19086,7 +19113,7 @@ class PluginManager {
   async loadPlugins(customDirs) {
     const pluginPaths = customDirs && customDirs.length > 0 ? customDirs.map((dir) => join22(dir, "*.{ts,js}").replace(/\\/g, "/")) : [
       "./.pk-agent/plugins/*.{ts,js}",
-      join22(homedir20(), ".pk-agent/plugins/*.{ts,js}").replace(/\\/g, "/")
+      join22(homedir18(), ".pk-agent/plugins/*.{ts,js}").replace(/\\/g, "/")
     ];
     for (const pattern of pluginPaths) {
       try {
@@ -20302,10 +20329,11 @@ function createTestCommand() {
 }
 
 // src/cli/tray.ts
+init_pk_agent_dirs();
 import { Command as Command14 } from "commander";
 import matter5 from "gray-matter";
 import YAML2 from "yaml";
-import { homedir as homedir21 } from "os";
+import { homedir as homedir19 } from "os";
 import { basename as basename8, join as join24, resolve as resolve25 } from "path";
 import { existsSync as existsSync17 } from "fs";
 import { mkdir as mkdir7, readFile as readFile11, readdir, writeFile as writeFile8 } from "fs/promises";
@@ -20320,7 +20348,7 @@ var TOGGLEABLE_ABILITIES = [
   "pkAgentBuilder"
 ];
 function getGlobalAgentsDir() {
-  return join24(homedir21(), ".pk-agent", "agents");
+  return getUserAgentsDir();
 }
 function getAbilityListFromFrontmatter(frontmatter) {
   const abilities = [];
@@ -20516,7 +20544,7 @@ function Build-Menu {
   $openAgents = New-Object System.Windows.Forms.ToolStripMenuItem
   $openAgents.Text = 'Open global agents folder'
   $openAgents.Add_Click({
-    $dir = Join-Path $HOME '.pk-agent\\agents'
+    $dir = Join-Path $HOME '.agents\\pk-agents'
     New-Item -ItemType Directory -Force -Path $dir | Out-Null
     Start-Process explorer.exe $dir
   })
@@ -20549,11 +20577,12 @@ async function launchWindowsTray() {
   const cliExecPath = process.execPath;
   const cliScriptPath = process.argv[1];
   const script = buildTrayScript(cliExecPath, cliScriptPath);
-  const scriptPath = join24(homedir21(), ".pk-agent", "cache", "pk-agent-tray.ps1");
-  await mkdir7(join24(homedir21(), ".pk-agent", "cache"), { recursive: true });
+  const scriptPath = join24(homedir19(), ".pk-agent", "cache", "pk-agent-tray.ps1");
+  await mkdir7(join24(homedir19(), ".pk-agent", "cache"), { recursive: true });
   await writeFile8(scriptPath, script, "utf-8");
   spawn7("powershell", [
     "-NoProfile",
+    "-STA",
     "-ExecutionPolicy",
     "Bypass",
     "-File",
@@ -20909,5 +20938,5 @@ if (process.argv[2] === "--internal-worker") {
   }
 }
 
-//# debugId=18D15260DA895C9E64756E2164756E21
+//# debugId=89312255A2812ED064756E2164756E21
 //# sourceMappingURL=index.js.map