dexto 1.10.4 → 1.12.0

package/dist/cli/commands/init.js

@@ -1,5 +1,5 @@
 import * as p from '@clack/prompts';
-import { createDextoAgentFromConfig, deriveDisplayName, findProjectRegistryPath as findSharedProjectRegistryPath, getPrimaryApiKeyEnvVar, getProjectRegistryPath as getCanonicalProjectRegistryPath, ProjectRegistrySchema, readProjectRegistry as readSharedProjectRegistry, writeConfigFile, } from '@dexto/agent-management';
+import { createDextoAgentFromConfig, deriveDisplayName, discoverStandaloneSkills, findProjectRegistryPath as findSharedProjectRegistryPath, getPrimaryApiKeyEnvVar, getProjectRegistryPath as getCanonicalProjectRegistryPath, ProjectRegistrySchema, readProjectRegistry as readSharedProjectRegistry, writeConfigFile, } from '@dexto/agent-management';
 import chalk from 'chalk';
 import { spawn } from 'node:child_process';
 import { promises as fs } from 'node:fs';
@@ -13,7 +13,7 @@ import { discoverPrimaryWorkspaceAgent } from './deploy/entry-agent.js';
 import { confirmOrExit, multiselectOrExit, selectOrExit, textOrExit, } from '../utils/prompt-helpers.js';
 import { ensureImageImporterConfigured } from '../utils/image-importer.js';
 const AGENTS_FILENAME = 'AGENTS.md';
-const WORKSPACE_DIRECTORIES = ['agents', 'skills'];
+const WORKSPACE_DIRECTORIES = ['agents', path.join('.agents', 'skills')];
 const SKILL_RESOURCE_DIRECTORIES = ['handlers', 'scripts', 'mcps', 'references'];
 const STARTER_SKILL_ID = 'create-skill';
 const STARTER_SKILL_IDS = [STARTER_SKILL_ID];
@@ -27,7 +27,8 @@ This workspace can define project-specific agents and skills.
 
 ## Structure
 - Put custom agents and subagents in \`agents/\`
-- Put custom skills in \`skills/<skill-id>/\`
+- Put custom skills in \`.agents/skills/<skill-id>/\`
+- Existing \`skills/\` and \`.dexto/skills/\` bundles remain discoverable for compatibility; create new skills under \`.agents/skills/\`
 - Each skill bundle should keep \`SKILL.md\` plus optional \`handlers/\`, \`scripts/\`, \`mcps/\`, and \`references/\`
 - Use \`.dexto/\` only for Dexto-managed state and installed assets
 
@@ -38,7 +39,7 @@ This workspace can define project-specific agents and skills.
 const CORE_AGENT_TOOL_ENTRIES = [
     {
         type: 'builtin-tools',
-        enabledTools: ['ask_user', 'invoke_skill', 'sleep'],
+        enabledTools: ['ask_user', 'skill_load', 'sleep'],
     },
 ];
 const ALWAYS_ENABLED_AGENT_TOOL_ENTRIES = [
@@ -800,7 +801,7 @@ async function resolveInitAgentInput(agentIdInput, options, workspaceRoot) {
         `${chalk.cyan('Workspace role:')} ${roleSummary}`,
         `${chalk.cyan('System prompt:')} ${promptResult.mode === 'generate' ? 'Generated from description' : 'Custom'}`,
         `${chalk.cyan('Tool bundles:')} ${formatBundleSelection(bundleIds)}`,
-        `${chalk.cyan('Core utilities:')} ask_user, invoke_skill, sleep`,
+        `${chalk.cyan('Core utilities:')} ask_user, skill_load, sleep`,
         `${chalk.cyan('Agent creation:')} enabled by default`,
     ].join('\n'), 'Agent Summary');
     const confirmed = await confirmOrExit({
@@ -866,7 +867,7 @@ description: "Create or update Dexto skill bundles with SKILL.md, handlers, scri
 
 # Create Skill
 
-Create or update standalone Dexto skill bundles. Treat \`skills/<id>/\` as the canonical workspace location unless the user explicitly asks for a global skill.
+Create or update standalone Dexto skill bundles. Treat \`.agents/skills/<id>/\` as the canonical workspace location unless the user explicitly asks for a global skill.
 
 ## Core Flow
 1. Search for overlap first with \`skill_list\` and \`skill_search\`.
@@ -879,7 +880,7 @@ Create or update standalone Dexto skill bundles. Treat \`skills/<id>/\` as the c
    - \`handlers/\` for reusable workflow logic or structured helper code
    - \`mcps/\` for inert MCP-related reference/config files
 6. Prefer extending existing skills or references over duplicating content.
-7. If you edit \`SKILL.md\` or bundled files with non-creator tools, run \`skill_refresh\` before relying on the skill in the current session.
+7. If you edit \`SKILL.md\` or bundled files with non-creator tools, use \`skill_load\` to reread the current Skill before relying on it in the current session.
 8. Creating \`mcps/*.json\` only creates inert bundled files. Configure runtime MCP servers through normal MCP configuration paths.
 
 ## Authoring Rules
@@ -888,7 +889,7 @@ Create or update standalone Dexto skill bundles. Treat \`skills/<id>/\` as the c
 - Use \`references/\` sparingly for larger copied docs, external references, schemas, examples, or policies.
 - Keep references one level deep from \`SKILL.md\` and link them explicitly.
 - Reuse language and conventions from nearby skills when possible.
-- If you update bundled resources outside creator tools, run \`skill_refresh\` so the current session reloads the latest skill content before invoking it.
+- If you update bundled resources outside creator tools, use \`skill_load\` so the current session reads the latest skill content before invoking it.
 
 ## SKILL.md Structure
 - \`# <Title>\`
@@ -907,7 +908,7 @@ function buildCreateSkillStarterReference() {
 
 ## Canonical Layout
 \`\`\`
-skills/<skill-id>/
+.agents/skills/<skill-id>/
 ├── SKILL.md
 ├── handlers/
 ├── scripts/
@@ -934,7 +935,7 @@ skills/<skill-id>/
 - Files under \`mcps/\` are bundled content only.
 - Skills do not register or connect MCP servers from \`mcps/\`.
 - Configure runtime MCP servers through normal agent MCP configuration paths.
-- Run \`skill_refresh\` after editing bundled files so the running session reloads the latest skill content.
+- The \`skill_load\` tool rereads the current skill files, so no refresh step is required after editing bundled files.
 `;
 }
 function buildCreateSkillMcpReference() {
@@ -1031,7 +1032,7 @@ await server.connect(transport);
 
 ## Verification Sequence
 1. Create or update \`SKILL.md\`, \`scripts/\`, and any inert \`mcps/\` reference files.
-2. Run \`skill_refresh\` after non-creator file edits.
+2. Use \`skill_load\` to reread the current Skill after non-creator file edits.
 3. Invoke the skill in the current session and confirm the updated instructions load.
 4. Configure and verify runtime MCP servers separately through normal MCP configuration paths.
 
@@ -1196,7 +1197,7 @@ export async function createWorkspaceAgentScaffold(agentIdInput, options = {}, w
 export async function createWorkspaceSkillScaffold(skillIdInput, workspaceRoot = process.cwd()) {
     const skillId = normalizeScaffoldId(skillIdInput, 'skill');
     const workspace = await createWorkspaceScaffold(workspaceRoot);
-    const skillDirPath = path.join(workspace.root, 'skills', skillId);
+    const skillDirPath = path.join(workspace.root, '.agents', 'skills', skillId);
     const skillFilePath = path.join(skillDirPath, 'SKILL.md');
     const resourceDirectories = [];
     const extraFiles = [];
@@ -1329,36 +1330,10 @@ function formatSkillPaths(result) {
     return createdPaths;
 }
 async function listWorkspaceSkillIds(workspaceRoot) {
-    const skillsRoot = path.join(workspaceRoot, 'skills');
-    try {
-        const entries = await fs.readdir(skillsRoot, { withFileTypes: true });
-        const skillIds = [];
-        for (const entry of entries) {
-            if (!entry.isDirectory()) {
-                continue;
-            }
-            const skillFilePath = path.join(skillsRoot, entry.name, 'SKILL.md');
-            try {
-                const stat = await fs.stat(skillFilePath);
-                if (stat.isFile()) {
-                    skillIds.push(entry.name);
-                }
-            }
-            catch (error) {
-                if (error.code === 'ENOENT') {
-                    continue;
-                }
-                throw error;
-            }
-        }
-        return skillIds.sort((left, right) => left.localeCompare(right));
-    }
-    catch (error) {
-        if (error.code === 'ENOENT') {
-            return [];
-        }
-        throw error;
-    }
+    return discoverStandaloneSkills(workspaceRoot)
+        .filter((skill) => skill.source === 'project')
+        .map((skill) => skill.name)
+        .sort((left, right) => left.localeCompare(right));
 }
 function describeEffectiveDeployAgent(input) {
     if (input.deployConfig) {
@@ -1377,7 +1352,7 @@ export async function inspectWorkspaceStatus(workspaceRoot = process.cwd()) {
     await ensureWorkspaceRoot(root);
     const agentsFilePresent = (await getExistingEntryType(path.join(root, AGENTS_FILENAME))) === 'file';
     const agentsDirectoryPresent = (await getExistingEntryType(path.join(root, 'agents'))) === 'directory';
-    const skillsDirectoryPresent = (await getExistingEntryType(path.join(root, 'skills'))) === 'directory';
+    const skillsDirectoryPresent = (await getExistingEntryType(path.join(root, '.agents', 'skills'))) === 'directory';
     const registryPath = await findSharedProjectRegistryPath(root);
     const registry = registryPath ? await readSharedProjectRegistry(registryPath) : null;
     const primaryAgentId = registry ? getEffectiveWorkspacePrimaryAgentId(registry) : null;
@@ -1416,7 +1391,7 @@ function formatWorkspaceStatus(result) {
         `Workspace: ${result.workspaceRoot}`,
         `AGENTS.md: ${result.agentsFilePresent ? 'present' : 'missing'}`,
         `agents/: ${result.agentsDirectoryPresent ? 'present' : 'missing'}`,
-        `skills/: ${result.skillsDirectoryPresent ? 'present' : 'missing'}`,
+        `.agents/skills/: ${result.skillsDirectoryPresent ? 'present' : 'missing'}`,
         `Registry: ${result.registryPath ? path.relative(result.workspaceRoot, result.registryPath) : 'none'}`,
         `Primary agent: ${result.primaryAgentId ?? 'none (global default used locally)'}`,
         `Allow global agents: ${result.allowGlobalAgents === null