@vionwilliams/agent-os 1.0.0-alpha.18 → 1.0.0-alpha.20

package/README.md

@@ -2,7 +2,7 @@
 
 > 智能任务通用工作系统 · 多模型路由 + 意图编排 + 多智能体协调 + DataHub + 可编程面板 + LLM 知识编译器
 
-**Status**: `1.0.0-alpha.18` · Beta 测试版 · npm 公共包可用
+**Status**: `1.0.0-alpha.20` · Beta 测试版 · npm 公共包可用
 
 ---
 
@@ -64,7 +64,7 @@ bash install-agent-os-mac.sh
 agent-os --version
 ```
 
-成功时会显示 `1.0.0-alpha.18 (Agent-OS)` 或更新版本。
+成功时会显示 `1.0.0-alpha.20 (Agent-OS)` 或更新版本。
 
 然后打开 Agent-OS：
 

package/dist/cli.js

@@ -93307,7 +93307,7 @@ var init_system = __esm(() => {
     AGENT_SDK_CLAUDE_CODE_PRESET_PREFIX,
     AGENT_SDK_PREFIX
   ];
-  AGENT_OS_VERSION = typeof MACRO !== "undefined" ? "1.0.0-alpha.18" : "dev";
+  AGENT_OS_VERSION = typeof MACRO !== "undefined" ? "1.0.0-alpha.20" : "dev";
   CLI_SYSPROMPT_PREFIXES = new Set(CLI_SYSPROMPT_PREFIX_VALUES);
 });
 
@@ -93751,7 +93751,7 @@ function getClaudeCodeUserAgent() {
 }
 var AGENT_OS_VERSION2;
 var init_userAgent = __esm(() => {
-  AGENT_OS_VERSION2 = typeof MACRO !== "undefined" ? "1.0.0-alpha.18" : "dev";
+  AGENT_OS_VERSION2 = typeof MACRO !== "undefined" ? "1.0.0-alpha.20" : "dev";
 });
 
 // src/utils/http.ts
@@ -93832,7 +93832,7 @@ var init_http2 = __esm(() => {
   init_auth();
   init_userAgent();
   init_workloadContext();
-  AGENT_OS_VERSION3 = typeof MACRO !== "undefined" ? "1.0.0-alpha.18" : "dev";
+  AGENT_OS_VERSION3 = typeof MACRO !== "undefined" ? "1.0.0-alpha.20" : "dev";
 });
 
 // src/services/api/router/userProviders.ts
@@ -108830,8 +108830,10 @@ function convertToSandboxRuntimeConfig(settings) {
     denyWrite.push(resolve12(cwd2, ".claude", "settings.json"));
     denyWrite.push(resolve12(cwd2, ".claude", "settings.local.json"));
   }
+  denyWrite.push(resolve12(originalCwd, ".agent-os", "skills"));
   denyWrite.push(resolve12(originalCwd, ".claude", "skills"));
   if (cwd2 !== originalCwd) {
+    denyWrite.push(resolve12(cwd2, ".agent-os", "skills"));
     denyWrite.push(resolve12(cwd2, ".claude", "skills"));
   }
   bareGitRepoScrubPaths.length = 0;
@@ -207166,7 +207168,7 @@ var init_sessionStorage = __esm(() => {
   init_settings2();
   init_slowOperations();
   init_uuid();
-  VERSION4 = typeof MACRO !== "undefined" ? "1.0.0-alpha.18" : "unknown";
+  VERSION4 = typeof MACRO !== "undefined" ? "1.0.0-alpha.20" : "unknown";
   MAX_TOMBSTONE_REWRITE_BYTES = 50 * 1024 * 1024;
   SKIP_FIRST_PROMPT_PATTERN = /^(?:\s*<[a-z][\w-]*[\s>]|\[Request interrupted by user[^\]]*\])/;
   EPHEMERAL_PROGRESS_TYPES = new Set([
@@ -207296,7 +207298,7 @@ function Feedback({
       platform: env3.platform,
       gitRepo: envInfo.isGit,
       terminal: env3.terminal,
-      version: "1.0.0-alpha.18",
+      version: "1.0.0-alpha.20",
       transcript: normalizeMessagesForAPI(messages),
       errors: sanitizedErrors,
       lastApiRequest: getLastAPIRequest(),
@@ -207480,7 +207482,7 @@ function Feedback({
                       ", ",
                       env3.terminal,
                       ", v",
-                      "1.0.0-alpha.18"
+                      "1.0.0-alpha.20"
                     ]
                   })
                 ]
@@ -207586,7 +207588,7 @@ ${sanitizedDescription}
 ` + `**Environment Info**
 ` + `- Platform: ${env3.platform}
 ` + `- Terminal: ${env3.terminal}
-` + `- Version: ${"1.0.0-alpha.18"}
+` + `- Version: ${"1.0.0-alpha.20"}
 ` + `- Feedback ID: ${feedbackId}
 ` + `
 **Errors**
@@ -259971,8 +259973,8 @@ var init_toolAnalytics = __esm(() => {
   init_agentContext();
   init_slowOperations();
   init_teammate();
-  AGENT_OS_VERSION4 = typeof MACRO !== "undefined" ? "1.0.0-alpha.18" : "dev";
-  AGENT_OS_BUILD_TIME = typeof MACRO !== "undefined" ? "2026-05-20T10:43:03Z" : undefined;
+  AGENT_OS_VERSION4 = typeof MACRO !== "undefined" ? "1.0.0-alpha.20" : "dev";
+  AGENT_OS_BUILD_TIME = typeof MACRO !== "undefined" ? "2026-05-20T19:41:00Z" : undefined;
   BUILTIN_MCP_SERVER_NAMES = new Set([]);
   TOOL_INPUT_MAX_JSON_CHARS = 4 * 1024;
   FILE_COMMANDS = new Set([
@@ -270151,6 +270153,37 @@ import {
   sep as pathSep,
   relative as relative8
 } from "path";
+function getProjectSkillsPath() {
+  return join64(".agent-os", "skills");
+}
+function getProjectSkillsPathForRoot(root2) {
+  return join64(root2, ".agent-os", "skills");
+}
+function getLegacyProjectSkillsPathForRoot(root2) {
+  return join64(root2, ".claude", "skills");
+}
+function getAdditionalSkillsPaths(root2) {
+  return [
+    getProjectSkillsPathForRoot(root2),
+    getLegacyProjectSkillsPathForRoot(root2)
+  ];
+}
+function getContainingProjectSkillsRoot(filePath, cwd2) {
+  const relativePath = relative8(cwd2, filePath);
+  if (!relativePath || relativePath.startsWith("..") || isAbsolute14(relativePath)) {
+    return null;
+  }
+  const parts = relativePath.split(pathSep).filter(Boolean);
+  for (let i4 = 0;i4 < parts.length - 2; i4++) {
+    const configDir = parts[i4];
+    const skillsDir = parts[i4 + 1];
+    const skillName = parts[i4 + 2];
+    if ((configDir === ".agent-os" || configDir === ".claude") && skillsDir === "skills" && skillName) {
+      return join64(cwd2, ...parts.slice(0, i4 + 2));
+    }
+  }
+  return null;
+}
 function getSkillsPath(source, dir) {
   switch (source) {
     case "policySettings":
@@ -270158,7 +270191,7 @@ function getSkillsPath(source, dir) {
     case "userSettings":
       return join64(getClaudeConfigHomeDir(), dir);
     case "projectSettings":
-      return `.claude/${dir}`;
+      return dir === "skills" ? getProjectSkillsPath() : `.claude/${dir}`;
     case "plugin":
       return "plugin";
     default:
@@ -270480,10 +270513,21 @@ async function discoverSkillDirsForPaths(filePaths, cwd2) {
   const resolvedCwd = cwd2.endsWith(pathSep) ? cwd2.slice(0, -1) : cwd2;
   const newDirs = [];
   for (const filePath of filePaths) {
+    const containingSkillsRoot = getContainingProjectSkillsRoot(filePath, resolvedCwd);
+    if (containingSkillsRoot !== null && !dynamicSkillDirs.has(containingSkillsRoot)) {
+      dynamicSkillDirs.add(containingSkillsRoot);
+      newDirs.push(containingSkillsRoot);
+    }
     let currentDir = dirname27(filePath);
     while (currentDir.startsWith(resolvedCwd + pathSep)) {
-      const skillDir = join64(currentDir, ".claude", "skills");
-      if (!dynamicSkillDirs.has(skillDir)) {
+      const skillDirs = [
+        getProjectSkillsPathForRoot(currentDir),
+        getLegacyProjectSkillsPathForRoot(currentDir)
+      ];
+      for (const skillDir of skillDirs) {
+        if (dynamicSkillDirs.has(skillDir)) {
+          continue;
+        }
         dynamicSkillDirs.add(skillDir);
         try {
           await fs6.stat(skillDir);
@@ -270601,7 +270645,7 @@ var init_loadSkillsDir = __esm(() => {
         logForDebugging(`[bare] Skipping skill dir discovery (${additionalDirs.length === 0 ? "no --add-dir" : "projectSettings disabled or skillsLocked"})`);
         return [];
       }
-      const additionalSkillsNested2 = await Promise.all(additionalDirs.map((dir) => loadSkillsFromSkillsDir(join64(dir, ".claude", "skills"), "projectSettings")));
+      const additionalSkillsNested2 = await Promise.all(additionalDirs.flatMap((dir) => getAdditionalSkillsPaths(dir)).map((dir) => loadSkillsFromSkillsDir(dir, "projectSettings")));
       return additionalSkillsNested2.flat().map((s2) => s2.skill);
     }
     const [
@@ -270614,7 +270658,7 @@ var init_loadSkillsDir = __esm(() => {
       isEnvTruthy(process.env.CLAUDE_CODE_DISABLE_POLICY_SKILLS) ? Promise.resolve([]) : loadSkillsFromSkillsDir(managedSkillsDir, "policySettings"),
       isSettingSourceEnabled("userSettings") && !skillsLocked ? loadSkillsFromSkillsDir(userSkillsDir, "userSettings") : Promise.resolve([]),
       projectSettingsEnabled ? Promise.all(projectSkillsDirs.map((dir) => loadSkillsFromSkillsDir(dir, "projectSettings"))) : Promise.resolve([]),
-      projectSettingsEnabled ? Promise.all(additionalDirs.map((dir) => loadSkillsFromSkillsDir(join64(dir, ".claude", "skills"), "projectSettings"))) : Promise.resolve([]),
+      projectSettingsEnabled ? Promise.all(additionalDirs.flatMap((dir) => getAdditionalSkillsPaths(dir)).map((dir) => loadSkillsFromSkillsDir(dir, "projectSettings"))) : Promise.resolve([]),
       skillsLocked ? Promise.resolve([]) : loadSkillsFromCommandsDir(cwd2)
     ]);
     const allSkillsWithPaths = [
@@ -274576,7 +274620,7 @@ function getInstallationEnv() {
   return;
 }
 function getClaudeCodeVersion() {
-  return "1.0.0-alpha.18";
+  return "1.0.0-alpha.20";
 }
 async function getInstalledVSCodeExtensionVersion(command) {
   const { stdout } = await execFileNoThrow(command, ["--list-extensions", "--show-versions"], {
@@ -297294,7 +297338,7 @@ async function setupSdkMcpClients(sdkMcpConfigs, sendMcpMessage) {
     const client = new Client({
       name: "claude-code",
       title: "Agent-OS",
-      version: "1.0.0-alpha.18",
+      version: "1.0.0-alpha.20",
       description: "Anthropic's agentic coding tool",
       websiteUrl: PRODUCT_URL
     }, {
@@ -297647,7 +297691,7 @@ var init_client4 = __esm(() => {
       const client = new Client({
         name: "claude-code",
         title: "Agent-OS",
-        version: "1.0.0-alpha.18",
+        version: "1.0.0-alpha.20",
         description: "Anthropic's agentic coding tool",
         websiteUrl: PRODUCT_URL
       }, {
@@ -325287,16 +325331,6 @@ String: ${old_string}`,
       const fs7 = getFsImplementation();
       const absoluteFilePath = expandPath(file_path);
       const cwd2 = getCwd();
-      if (!isEnvTruthy(process.env.CLAUDE_CODE_SIMPLE)) {
-        const newSkillDirs = await discoverSkillDirsForPaths([absoluteFilePath], cwd2);
-        if (newSkillDirs.length > 0) {
-          for (const dir of newSkillDirs) {
-            dynamicSkillDirTriggers?.add(dir);
-          }
-          addSkillDirectories(newSkillDirs).catch(() => {});
-        }
-        activateConditionalSkillsForPaths([absoluteFilePath], cwd2);
-      }
       await diagnosticTracker.beforeFileEdited(absoluteFilePath);
       await fs7.mkdir(dirname41(absoluteFilePath));
       if (fileHistoryEnabled()) {
@@ -325329,6 +325363,20 @@ String: ${old_string}`,
         replaceAll: replace_all
       });
       writeTextContent(absoluteFilePath, updatedFile, encoding, endings);
+      if (!isEnvTruthy(process.env.CLAUDE_CODE_SIMPLE)) {
+        const newSkillDirs = await discoverSkillDirsForPaths([absoluteFilePath], cwd2);
+        if (newSkillDirs.length > 0) {
+          for (const dir of newSkillDirs) {
+            dynamicSkillDirTriggers?.add(dir);
+          }
+          try {
+            await addSkillDirectories(newSkillDirs);
+          } catch (error41) {
+            logError2(error41);
+          }
+        }
+        activateConditionalSkillsForPaths([absoluteFilePath], cwd2);
+      }
       const lspManager = getLspServerManager();
       if (lspManager) {
         clearDeliveredDiagnosticsForFile(`file://${absoluteFilePath}`);
@@ -325994,14 +326042,6 @@ var init_FileWriteTool = __esm(() => {
       const fullFilePath = expandPath(file_path);
       const dir = dirname42(fullFilePath);
       const cwd2 = getCwd();
-      const newSkillDirs = await discoverSkillDirsForPaths([fullFilePath], cwd2);
-      if (newSkillDirs.length > 0) {
-        for (const dir2 of newSkillDirs) {
-          dynamicSkillDirTriggers?.add(dir2);
-        }
-        addSkillDirectories(newSkillDirs).catch(() => {});
-      }
-      activateConditionalSkillsForPaths([fullFilePath], cwd2);
       await diagnosticTracker.beforeFileEdited(fullFilePath);
       await getFsImplementation().mkdir(dir);
       if (fileHistoryEnabled()) {
@@ -326030,6 +326070,18 @@ var init_FileWriteTool = __esm(() => {
       const enc = meta?.encoding ?? "utf8";
       const oldContent = meta?.content ?? null;
       writeTextContent(fullFilePath, content, enc, "LF");
+      const newSkillDirs = await discoverSkillDirsForPaths([fullFilePath], cwd2);
+      if (newSkillDirs.length > 0) {
+        for (const dir2 of newSkillDirs) {
+          dynamicSkillDirTriggers?.add(dir2);
+        }
+        try {
+          await addSkillDirectories(newSkillDirs);
+        } catch (error41) {
+          logError2(error41);
+        }
+      }
+      activateConditionalSkillsForPaths([fullFilePath], cwd2);
       const lspManager = getLspServerManager();
       if (lspManager) {
         clearDeliveredDiagnosticsForFile(`file://${fullFilePath}`);
@@ -416284,7 +416336,7 @@ function getInvokedBinary() {
 async function getDoctorDiagnostic() {
   return {
     installationType: "package-manager",
-    version: "1.0.0-alpha.18",
+    version: "1.0.0-alpha.20",
     installationPath: process.argv[1] ?? "",
     invokedBinary: getInvokedBinary(),
     configInstallMethod: "not set",
@@ -416689,7 +416741,7 @@ function buildPrimarySection() {
   });
   return [{
     label: "Version",
-    value: "1.0.0-alpha.18"
+    value: "1.0.0-alpha.20"
   }, {
     label: "Session name",
     value: nameValue
@@ -420332,7 +420384,7 @@ function Config({
         }
       })
     }) : showSubmenu === "ChannelDowngrade" ? /* @__PURE__ */ jsx_runtime169.jsx(ChannelDowngradeDialog, {
-      currentVersion: "1.0.0-alpha.18",
+      currentVersion: "1.0.0-alpha.20",
       onChoice: (choice) => {
         setShowSubmenu(null);
         setTabsHidden(false);
@@ -420344,7 +420396,7 @@ function Config({
           autoUpdatesChannel: "stable"
         };
         if (choice === "stay") {
-          newSettings.minimumVersion = "1.0.0-alpha.18";
+          newSettings.minimumVersion = "1.0.0-alpha.20";
         }
         updateSettingsForSource("userSettings", newSettings);
         setSettingsData((prev_27) => ({
@@ -428335,7 +428387,7 @@ function HelpV2(t0) {
   let t6;
   if ($3[31] !== tabs) {
     t6 = /* @__PURE__ */ jsx_runtime195.jsx(Tabs, {
-      title: `Agent-OS v${"1.0.0-alpha.18"}`,
+      title: `Agent-OS v${"1.0.0-alpha.20"}`,
       color: "professionalBlue",
       defaultTab: "general",
       children: tabs
@@ -429664,9 +429716,9 @@ Based on the areas detected in Phase 1, you may need to create multiple verifier
 
 ## Phase 4: Generate Verifier Skill
 
-**All verifier skills are created in the project root's \`.claude/skills/\` directory.** This ensures they are automatically loaded when Agent-OS runs in the project.
+**All verifier skills are created in the project root's \`.agent-os/skills/\` directory.** This ensures they are automatically loaded when Agent-OS runs in the project.
 
-Write the skill file to \`.claude/skills/<verifier-name>/SKILL.md\`.
+Write the skill file to \`.agent-os/skills/<verifier-name>/SKILL.md\`.
 
 ### Skill Template Structure
 
@@ -429750,7 +429802,7 @@ allowed-tools:
 ## Phase 5: Confirm Creation
 
 After writing the skill file(s), inform the user:
-1. Where each skill was created (always in \`.claude/skills/\`)
+1. Where each skill was created (always in \`.agent-os/skills/\`)
 2. How the Verify agent will discover them \u2014 the folder name must contain "verifier" (case-insensitive) for automatic discovery
 3. That they can edit the skills to customize them
 4. That they can run /init-verifiers again to add more verifiers for other areas
@@ -431463,7 +431515,7 @@ var init_user = __esm(() => {
       deviceId,
       sessionId: getSessionId(),
       email: getEmail(),
-      appVersion: "1.0.0-alpha.18",
+      appVersion: "1.0.0-alpha.20",
       platform: getHostPlatformForAnalytics(),
       organizationUuid,
       accountUuid,
@@ -451714,7 +451766,7 @@ function getAllReleaseNotes(changelogContent = getStoredChangelogFromMemory()) {
     return [];
   }
 }
-async function checkForReleaseNotes(lastSeenVersion, currentVersion = "1.0.0-alpha.18") {
+async function checkForReleaseNotes(lastSeenVersion, currentVersion = "1.0.0-alpha.20") {
   if (process.env.USER_TYPE === "ant") {
     const changelog = "";
     if (changelog) {
@@ -451741,7 +451793,7 @@ async function checkForReleaseNotes(lastSeenVersion, currentVersion = "1.0.0-alp
     releaseNotes
   };
 }
-function checkForReleaseNotesSync(lastSeenVersion, currentVersion = "1.0.0-alpha.18") {
+function checkForReleaseNotesSync(lastSeenVersion, currentVersion = "1.0.0-alpha.20") {
   if (process.env.USER_TYPE === "ant") {
     const changelog = "";
     if (changelog) {
@@ -452868,7 +452920,7 @@ function getRecentActivitySync() {
   return cachedActivity;
 }
 function getLogoDisplayData() {
-  const version2 = process.env.DEMO_VERSION ?? "1.0.0-alpha.18";
+  const version2 = process.env.DEMO_VERSION ?? "1.0.0-alpha.20";
   const serverUrl = getDirectConnectServerUrl();
   const displayPath = process.env.DEMO_VERSION ? "/code/claude" : getDisplayPath(getCwd());
   const cwd2 = serverUrl ? `${displayPath} in ${serverUrl.replace(/^https?:\/\//, "")}` : displayPath;
@@ -454083,7 +454135,7 @@ function LogoV2() {
   if ($3[2] === Symbol.for("react.memo_cache_sentinel")) {
     t2 = () => {
       const currentConfig = getGlobalConfig();
-      if (currentConfig.lastReleaseNotesSeen === "1.0.0-alpha.18") {
+      if (currentConfig.lastReleaseNotesSeen === "1.0.0-alpha.20") {
         return;
       }
       saveGlobalConfig(_temp328);
@@ -454749,12 +454801,12 @@ function AgentOsPoster() {
   });
 }
 function _temp328(current) {
-  if (current.lastReleaseNotesSeen === "1.0.0-alpha.18") {
+  if (current.lastReleaseNotesSeen === "1.0.0-alpha.20") {
     return current;
   }
   return {
     ...current,
-    lastReleaseNotesSeen: "1.0.0-alpha.18"
+    lastReleaseNotesSeen: "1.0.0-alpha.20"
   };
 }
 function _temp245(s_0) {
@@ -481331,7 +481383,7 @@ async function captureMemoryDiagnostics(trigger, dumpNumber = 0) {
     smapsRollup,
     platform: process.platform,
     nodeVersion: process.version,
-    ccVersion: "1.0.0-alpha.18"
+    ccVersion: "1.0.0-alpha.20"
   };
 }
 async function performHeapDump(trigger = "manual", dumpNumber = 0) {
@@ -481904,7 +481956,7 @@ var init_bridge_kick = __esm(() => {
 var call58 = async () => {
   return {
     type: "text",
-    value: `${"1.0.0-alpha.18"} (built ${"2026-05-20T10:43:03Z"})`
+    value: `${"1.0.0-alpha.20"} (built ${"2026-05-20T19:41:00Z"})`
   };
 }, version2, version_default;
 var init_version = __esm(() => {
@@ -491396,7 +491448,7 @@ function generateHtmlReport(data, insights) {
 </html>`;
 }
 function buildExportData(data, insights, facets, remoteStats) {
-  const version3 = typeof MACRO !== "undefined" ? "1.0.0-alpha.18" : "unknown";
+  const version3 = typeof MACRO !== "undefined" ? "1.0.0-alpha.20" : "unknown";
   const remote_hosts_collected = remoteStats?.hosts.filter((h3) => h3.sessionCount > 0).map((h3) => h3.name);
   const facets_summary = {
     total: facets.size,
@@ -508556,6 +508608,15 @@ import { statSync as statSync12 } from "fs";
 import { lstat as lstat4, readdir as readdir27, readFile as readFile49, realpath as realpath9, stat as stat38 } from "fs/promises";
 import { homedir as homedir33 } from "os";
 import { dirname as dirname59, join as join143, resolve as resolve46, sep as sep33 } from "path";
+function getProjectConfigSubdirCandidates(root3, subdir) {
+  if (subdir === "skills") {
+    return [
+      join143(root3, ".agent-os", subdir),
+      join143(root3, ".claude", subdir)
+    ];
+  }
+  return [join143(root3, ".claude", subdir)];
+}
 function extractDescriptionFromMarkdown(content, defaultDescription = "Custom item") {
   const lines2 = content.split(`
 `);
@@ -508645,13 +508706,15 @@ function getProjectDirsUpToHome(subdir, cwd2) {
     if (normalizePathForComparison(current) === normalizePathForComparison(home)) {
       break;
     }
-    const claudeSubdir = join143(current, ".claude", subdir);
-    try {
-      statSync12(claudeSubdir);
-      dirs.push(claudeSubdir);
-    } catch (e2) {
-      if (!isFsInaccessible(e2))
-        throw e2;
+    const candidateSubdirs = getProjectConfigSubdirCandidates(current, subdir);
+    for (const candidateSubdir of candidateSubdirs) {
+      try {
+        statSync12(candidateSubdir);
+        dirs.push(candidateSubdir);
+      } catch (e2) {
+        if (!isFsInaccessible(e2))
+          throw e2;
+      }
     }
     if (gitRoot && normalizePathForComparison(current) === normalizePathForComparison(gitRoot)) {
       break;
@@ -508795,12 +508858,13 @@ var init_markdownConfigLoader = __esm(() => {
     const gitRoot = findGitRoot(cwd2);
     const canonicalRoot = findCanonicalGitRoot(cwd2);
     if (gitRoot && canonicalRoot && canonicalRoot !== gitRoot) {
-      const worktreeSubdir = normalizePathForComparison(join143(gitRoot, ".claude", subdir));
-      const worktreeHasSubdir = projectDirs.some((dir) => normalizePathForComparison(dir) === worktreeSubdir);
+      const worktreeSubdirs = getProjectConfigSubdirCandidates(gitRoot, subdir).map((dir) => normalizePathForComparison(dir));
+      const worktreeHasSubdir = projectDirs.some((dir) => worktreeSubdirs.includes(normalizePathForComparison(dir)));
       if (!worktreeHasSubdir) {
-        const mainClaudeSubdir = join143(canonicalRoot, ".claude", subdir);
-        if (!projectDirs.includes(mainClaudeSubdir)) {
-          projectDirs.push(mainClaudeSubdir);
+        for (const mainSubdir of getProjectConfigSubdirCandidates(canonicalRoot, subdir)) {
+          if (!projectDirs.includes(mainSubdir)) {
+            projectDirs.push(mainSubdir);
+          }
         }
       }
     }
@@ -514720,6 +514784,14 @@ function getClaudeSkillScope(filePath) {
   const absolutePath = expandPath(filePath);
   const absolutePathLower = normalizeCaseForComparison(absolutePath);
   const bases = [
+    {
+      dir: expandPath(join146(getOriginalCwd(), ".agent-os", "skills")),
+      prefix: "/.agent-os/skills/"
+    },
+    {
+      dir: expandPath(join146(getClaudeConfigHomeDir(), "skills")),
+      prefix: "~/.agent-os/skills/"
+    },
     {
       dir: expandPath(join146(getOriginalCwd(), ".claude", "skills")),
       prefix: "/.claude/skills/"
@@ -515594,7 +515666,7 @@ var init_filesystem = __esm(() => {
   });
   getBundledSkillsRoot = memoize_default(function getBundledSkillsRoot2() {
     const nonce = randomBytes18(16).toString("hex");
-    return join146(getClaudeTempDir(), "bundled-skills", "1.0.0-alpha.18", nonce);
+    return join146(getClaudeTempDir(), "bundled-skills", "1.0.0-alpha.20", nonce);
   });
   getResolvedWorkingDirPaths = memoize_default(getPathsForPermissionCheck);
 });
@@ -520825,6 +520897,7 @@ function getSessionSpecificGuidanceSection(enabledTools, skillToolCommands) {
       `For broader codebase exploration and deep research, use the ${AGENT_TOOL_NAME} tool with subagent_type=${EXPLORE_AGENT.agentType}. This is slower than using ${searchTools} directly, so use this only when a simple, directed search proves to be insufficient or when your task will clearly require more than ${EXPLORE_AGENT_MIN_QUERIES} queries.`
     ] : [],
     hasSkills ? `/<skill-name> (e.g., /commit) is shorthand for users to invoke a user-invocable skill. When executed, the skill gets expanded to a full prompt. Use the ${SKILL_TOOL_NAME} tool to execute them. IMPORTANT: Only use ${SKILL_TOOL_NAME} for skills listed in its user-invocable skills section - do not guess or use built-in CLI commands.` : null,
+    `Agent-OS project skills must be created under \`.agent-os/skills/<skill-name>/SKILL.md\`; global user skills must be created under \`~/.agent-os/skills/<skill-name>/SKILL.md\`. Do not create new skills under \`.claude/skills\` unless the user explicitly asks for legacy Claude Code compatibility.`,
     DISCOVER_SKILLS_TOOL_NAME !== null && hasSkills && enabledTools.has(DISCOVER_SKILLS_TOOL_NAME) ? getDiscoverSkillsGuidance() : null,
     null
   ].filter((item) => item !== null);
@@ -521523,7 +521596,7 @@ function computeFingerprintFromMessages(messages) {
 }
 var AGENT_OS_VERSION5, FINGERPRINT_SALT = "59cf53e54c78";
 var init_fingerprint = __esm(() => {
-  AGENT_OS_VERSION5 = typeof MACRO !== "undefined" ? "1.0.0-alpha.18" : "dev";
+  AGENT_OS_VERSION5 = typeof MACRO !== "undefined" ? "1.0.0-alpha.20" : "dev";
 });
 
 // src/services/compact/apiMicrocompact.ts
@@ -523277,7 +523350,7 @@ async function sideQuery(opts) {
     betas.push(STRUCTURED_OUTPUTS_BETA_HEADER);
   }
   const messageText = extractFirstUserMessageText(messages);
-  const fingerprint = computeFingerprint(messageText, "1.0.0-alpha.18");
+  const fingerprint = computeFingerprint(messageText, "1.0.0-alpha.20");
   const attributionHeader = getAttributionHeader(fingerprint);
   const systemBlocks = [
     attributionHeader ? { type: "text", text: attributionHeader } : null,
@@ -525196,7 +525269,7 @@ function appendToLog(path24, message) {
     cwd: getFsImplementation().cwd(),
     userType: process.env.USER_TYPE,
     sessionId: getSessionId(),
-    version: "1.0.0-alpha.18"
+    version: "1.0.0-alpha.20"
   };
   getLogWriter(path24).write(messageWithTimestamp);
 }
@@ -528174,7 +528247,7 @@ function getTelemetryAttributes() {
     attributes["session.id"] = sessionId;
   }
   if (shouldIncludeAttribute("OTEL_METRICS_INCLUDE_VERSION")) {
-    attributes["app.version"] = "1.0.0-alpha.18";
+    attributes["app.version"] = "1.0.0-alpha.20";
   }
   if (envDynamic.terminal) {
     attributes["terminal.type"] = envDynamic.terminal;
@@ -538318,7 +538391,7 @@ function buildSystemInitMessage(inputs) {
     slash_commands: inputs.commands.filter((c5) => c5.userInvocable !== false).map((c5) => c5.name),
     apiKeySource: getAnthropicApiKeyWithSource().source,
     betas: getSdkBetas(),
-    claude_code_version: "1.0.0-alpha.18",
+    claude_code_version: "1.0.0-alpha.20",
     output_style: outputStyle2,
     agents: inputs.agents.map((agent) => agent.agentType),
     skills: inputs.skills.filter((s2) => s2.userInvocable !== false).map((skill) => skill.name),
@@ -560787,7 +560860,7 @@ function buildStatusLineCommandInput(permissionMode, exceeds200kTokens, settings
       project_dir: getOriginalCwd(),
       added_dirs: addedDirs
     },
-    version: "1.0.0-alpha.18",
+    version: "1.0.0-alpha.20",
     output_style: {
       name: outputStyleName
     },
@@ -567227,7 +567300,7 @@ async function applySkillImprovement(skillName, updates) {
     return;
   const { join: join159 } = await import("path");
   const fs10 = await import("fs/promises");
-  const filePath = join159(getCwd(), ".claude", "skills", skillName, "SKILL.md");
+  const filePath = join159(getCwd(), ".agent-os", "skills", skillName, "SKILL.md");
   let currentContent;
   try {
     currentContent = await fs10.readFile(filePath, "utf-8");
@@ -570317,11 +570390,15 @@ async function getWatchablePaths() {
     } catch {}
   }
   for (const dir of getAdditionalDirectoriesForClaudeMd()) {
-    const additionalSkillsPath = platformPath2.join(dir, ".claude", "skills");
-    try {
-      await fs11.stat(additionalSkillsPath);
-      paths2.push(additionalSkillsPath);
-    } catch {}
+    for (const additionalSkillsPath of [
+      platformPath2.join(dir, ".agent-os", "skills"),
+      platformPath2.join(dir, ".claude", "skills")
+    ]) {
+      try {
+        await fs11.stat(additionalSkillsPath);
+        paths2.push(additionalSkillsPath);
+      } catch {}
+    }
   }
   return paths2;
 }
@@ -574350,7 +574427,7 @@ var init_tipRegistry = __esm(() => {
     },
     {
       id: "custom-commands",
-      content: async () => "Create skills by adding .md files to .claude/skills/ in your project or ~/.agent-os/skills/ for skills that work in any project",
+      content: async () => "Create skills by adding SKILL.md files to .agent-os/skills/ in your project or ~/.agent-os/skills/ for skills that work in any project",
       cooldownSessions: 15,
       async isRelevant() {
         const config4 = getGlobalConfig();
@@ -584139,7 +584216,7 @@ function WelcomeV2() {
             dimColor: true,
             children: [
               "v",
-              "1.0.0-alpha.18",
+              "1.0.0-alpha.20",
               " "
             ]
           })
@@ -584339,7 +584416,7 @@ function WelcomeV2() {
           dimColor: true,
           children: [
             "v",
-            "1.0.0-alpha.18",
+            "1.0.0-alpha.20",
             " "
           ]
         })
@@ -584565,7 +584642,7 @@ function AppleTerminalWelcomeV2(t0) {
         dimColor: true,
         children: [
           "v",
-          "1.0.0-alpha.18",
+          "1.0.0-alpha.20",
           " "
         ]
       });
@@ -584819,7 +584896,7 @@ function AppleTerminalWelcomeV2(t0) {
       dimColor: true,
       children: [
         "v",
-        "1.0.0-alpha.18",
+        "1.0.0-alpha.20",
         " "
       ]
     });
@@ -586285,7 +586362,7 @@ function completeOnboarding() {
   saveGlobalConfig((current) => ({
     ...current,
     hasCompletedOnboarding: true,
-    lastOnboardingVersion: "1.0.0-alpha.18"
+    lastOnboardingVersion: "1.0.0-alpha.20"
   }));
 }
 function showDialog(root3, renderer) {
@@ -589186,7 +589263,7 @@ You will use the AskUserQuestion to understand what the user wants to automate.
 - If you think the skill will require arguments, suggest arguments based on what you observed. Make sure you understand what someone would need to provide.
 - If it's not clear, ask if this skill should run inline (in the current conversation) or forked (as a sub-agent with its own context). Forked is better for self-contained tasks that don't need mid-process user input; inline is better when the user wants to steer mid-process.
 - Ask where the skill should be saved. Suggest a default based on context (repo-specific workflows \u2192 repo, cross-repo personal workflows \u2192 user). Options:
-  - **This repo** (\`.claude/skills/<name>/SKILL.md\`) \u2014 for workflows specific to this project
+  - **This repo** (\`.agent-os/skills/<name>/SKILL.md\`) \u2014 for workflows specific to this project
   - **Personal** (\`~/.agent-os/skills/<name>/SKILL.md\`) \u2014 follows you across all repos
 
 **Round 3: Breaking down each step**
@@ -594748,8 +594825,8 @@ async function getEnvLessBridgeConfig() {
 }
 async function checkEnvLessBridgeMinVersion() {
   const cfg = await getEnvLessBridgeConfig();
-  if (cfg.min_version && lt("1.0.0-alpha.18", cfg.min_version)) {
-    return `Your version of Agent-OS (${"1.0.0-alpha.18"}) is too old for Remote Control.
+  if (cfg.min_version && lt("1.0.0-alpha.20", cfg.min_version)) {
+    return `Your version of Agent-OS (${"1.0.0-alpha.20"}) is too old for Remote Control.
 Version ${cfg.min_version} or higher is required. Run \`agent-os update\` to update.`;
   }
   return null;
@@ -595222,7 +595299,7 @@ async function initBridgeCore(params) {
   const rawApi = createBridgeApiClient({
     baseUrl,
     getAccessToken,
-    runnerVersion: "1.0.0-alpha.18",
+    runnerVersion: "1.0.0-alpha.20",
     onDebug: logForDebugging,
     onAuth401,
     getTrustedDeviceToken
@@ -600901,7 +600978,7 @@ async function startMCPServer(cwd3, debug2, verbose) {
   setCwd(cwd3);
   const server = new Server({
     name: "claude/tengu",
-    version: "1.0.0-alpha.18"
+    version: "1.0.0-alpha.20"
   }, {
     capabilities: {
       tools: {}
@@ -606412,7 +606489,7 @@ ${customInstructions}` : customInstructions;
       }
     }
     logForDiagnosticsNoPII("info", "started", {
-      version: "1.0.0-alpha.18",
+      version: "1.0.0-alpha.20",
       is_native_binary: isInBundledMode()
     });
     registerCleanup(async () => {
@@ -607204,7 +607281,7 @@ Usage: agent-os --remote "your task description"`, () => gracefulShutdown(1));
         pendingHookMessages
       }, renderAndRun);
     }
-  }).version("1.0.0-alpha.18 (Agent-OS)", "-v, --version", "Output the version number");
+  }).version("1.0.0-alpha.20 (Agent-OS)", "-v, --version", "Output the version number");
   program2.option("-w, --worktree [name]", "Create a new git worktree for this session (optionally specify a name)");
   program2.option("--tmux", "Create a tmux session for the worktree (requires --worktree). Uses iTerm2 native panes when available; use --tmux=classic for traditional tmux.");
   if (canUserConfigureAdvisor()) {
@@ -609042,7 +609119,7 @@ if (false) {}
 async function main2() {
   const args = process.argv.slice(2);
   if (args.length === 1 && (args[0] === "--version" || args[0] === "-v" || args[0] === "-V")) {
-    console.log(`${"1.0.0-alpha.18"} (Agent-OS)`);
+    console.log(`${"1.0.0-alpha.20"} (Agent-OS)`);
     return;
   }
   const {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vionwilliams/agent-os",
-  "version": "1.0.0-alpha.18",
+  "version": "1.0.0-alpha.20",
   "description": "Agent-OS — 智能任务通用工作系统：多模型路由、意图编排、多智能体协调、DataHub 与可编程面板。",
   "type": "module",
   "private": false,