@michaelhartmayer/agentctl 1.1.0 → 1.1.4

package/dist/skills.js

@@ -5,35 +5,23 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SUPPORTED_AGENTS = void 0;
 exports.copySkill = copySkill;
-const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
+const skills_1 = require("./logic/skills");
 exports.SUPPORTED_AGENTS = ['cursor', 'antigravity', 'agentsmd', 'gemini'];
 async function copySkill(targetDir, agent) {
-    // We assume the skill file is located at ../skills/agentctl/SKILL.md relative to specific dist/src/ location
-    // Or we find it in the project root if running from source.
-    // In production (dist), structure might be:
-    // dist/index.js
-    // skills/agentctl/SKILL.md (if we copy it to dist)
-    // Let's try to locate the source SKILL.md
-    // If we are in /src, it is in ../skills/agentctl/SKILL.md
-    // If we are in /dist/src (tsc default?), it depends on build.
-    // Robust finding:
-    let sourcePath = path_1.default.resolve(__dirname, '../../skills/agentctl/SKILL.md');
-    if (!fs_extra_1.default.existsSync(sourcePath)) {
-        // Try looking in src check (dev mode)
-        sourcePath = path_1.default.resolve(__dirname, '../skills/agentctl/SKILL.md');
+    const sources = skills_1.SkillsLogic.getSourcePaths({ dirname: __dirname });
+    let sourcePath = null;
+    for (const p of sources) {
+        if (fs_extra_1.default.existsSync(p)) {
+            sourcePath = p;
+            break;
+        }
     }
-    if (!fs_extra_1.default.existsSync(sourcePath)) {
-        // Fallback for when running from dist/src
-        sourcePath = path_1.default.resolve(__dirname, '../../../skills/agentctl/SKILL.md');
-    }
-    if (!fs_extra_1.default.existsSync(sourcePath)) {
-        throw new Error(`Could not locate source SKILL.md. Checked: ${path_1.default.resolve(__dirname, '../../skills/agentctl/SKILL.md')}`);
+    if (!sourcePath) {
+        throw new Error(`Could not locate source SKILL.md. Checked: ${sources[0]}`);
     }
     await fs_extra_1.default.ensureDir(targetDir);
-    // Determine filename
-    const filename = agent === 'cursor' ? 'agentctl.md' : 'SKILL.md';
-    const targetFile = path_1.default.join(targetDir, filename);
+    const targetFile = skills_1.SkillsLogic.getTargetPath(targetDir, agent);
     await fs_extra_1.default.copy(sourcePath, targetFile, { overwrite: true });
     return targetFile;
 }

package/package.json

@@ -4,7 +4,7 @@
     "access": "public"
   },
   "description": "Agent Controller - A unified interface for humans and AI agents",
-  "version": "1.1.0",
+  "version": "1.1.4",
   "main": "dist/index.js",
   "bin": {
     "agentctl": "./dist/index.js"

package/dist/package.json

@@ -1,60 +0,0 @@
-{
-    "name": "@michaelhartmayer/agentctl",
-    "publishConfig": {
-        "access": "public"
-    },
-    "description": "Agent Controller - A unified interface for humans and AI agents",
-    "version": "1.1.0",
-    "main": "dist/index.js",
-    "bin": {
-        "agentctl": "./dist/index.js"
-    },
-    "files": [
-        "dist",
-        "skills",
-        "scripts",
-        "agentctl.cmd",
-        "README.md"
-    ],
-    "scripts": {
-        "build": "tsc",
-        "test": "vitest run",
-        "test:watch": "vitest",
-        "lint": "eslint src tests",
-        "register:path": "node scripts/register-path.js",
-        "unregister:path": "node scripts/unregister-path.js",
-        "release": "standard-version",
-        "prepublishOnly": "npm run build && npm run test",
-        "prepare": "husky"
-    },
-    "keywords": [
-        "cli",
-        "agent",
-        "ai",
-        "automation",
-        "framework"
-    ],
-    "author": "Michael Hartmayer",
-    "license": "MIT",
-    "dependencies": {
-        "chalk": "^4.1.2",
-        "commander": "^14.0.3",
-        "fs-extra": "^11.3.3"
-    },
-    "devDependencies": {
-        "@commitlint/cli": "^20.4.1",
-        "@commitlint/config-conventional": "^20.4.1",
-        "@types/fs-extra": "^11.0.4",
-        "@types/node": "^25.2.3",
-        "@typescript-eslint/eslint-plugin": "^8.55.0",
-        "@typescript-eslint/parser": "^8.55.0",
-        "@vitest/coverage-v8": "^4.0.18",
-        "eslint": "^8.57.1",
-        "eslint-plugin-eslint-comments": "^3.2.0",
-        "husky": "^9.1.7",
-        "standard-version": "^9.5.0",
-        "ts-node": "^10.9.2",
-        "typescript": "^5.9.3",
-        "vitest": "^4.0.18"
-    }
-}

package/dist/src/ctl.js

@@ -1,316 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.scaffold = scaffold;
-exports.alias = alias;
-exports.group = group;
-exports.pushGlobal = pushGlobal;
-exports.pullLocal = pullLocal;
-exports.installSkill = installSkill;
-exports.rm = rm;
-exports.mv = mv;
-exports.inspect = inspect;
-exports.list = list;
-const fs_extra_1 = __importDefault(require("fs-extra"));
-const path_1 = __importDefault(require("path"));
-const resolve_1 = require("./resolve");
-const fs_utils_1 = require("./fs-utils");
-const manifest_1 = require("./manifest");
-async function scaffold(args, options = {}) {
-    const { targetDir, name, isWin } = await prepareCommand(args, options);
-    const scriptName = isWin ? 'command.cmd' : 'command.sh';
-    const scriptPath = path_1.default.join(targetDir, scriptName);
-    const scriptContent = isWin
-        ? '@echo off\r\nREM Add your command logic here\r\necho Not implemented'
-        : '#!/usr/bin/env bash\n# Add your command logic here\necho "Not implemented"';
-    await fs_extra_1.default.writeFile(scriptPath, scriptContent);
-    if (!isWin)
-        await fs_extra_1.default.chmod(scriptPath, 0o755);
-    const manifest = {
-        name,
-        description: '',
-        type: 'scaffold',
-        run: `./${scriptName}`,
-    };
-    await fs_extra_1.default.writeJson(path_1.default.join(targetDir, 'manifest.json'), manifest, { spaces: 2 });
-    console.log(`Scaffolded command: ${args.join(' ')}`);
-}
-async function alias(args, target, options = {}) {
-    const { targetDir, name } = await prepareCommand(args, options);
-    const manifest = {
-        name,
-        description: '',
-        type: 'alias',
-        run: target,
-    };
-    await fs_extra_1.default.writeJson(path_1.default.join(targetDir, 'manifest.json'), manifest, { spaces: 2 });
-    console.log(`Aliased command: ${args.join(' ')} -> ${target}`);
-}
-async function group(args, options = {}) {
-    const { targetDir, name } = await prepareCommand(args, options);
-    const manifest = {
-        name,
-        description: '',
-        type: 'group',
-    };
-    await fs_extra_1.default.writeJson(path_1.default.join(targetDir, 'manifest.json'), manifest, { spaces: 2 });
-    console.log(`Created group: ${args.join(' ')}`);
-}
-async function pushGlobal(args, options = {}) {
-    const cwd = options.cwd || process.cwd();
-    const localRoot = (0, fs_utils_1.findLocalRoot)(cwd);
-    if (!localRoot)
-        throw new Error('Not in a local context');
-    const globalRoot = options.globalDir || (0, fs_utils_1.getGlobalRoot)();
-    const localAgentctl = path_1.default.join(localRoot, '.agentctl');
-    const cmdPathStr = args.join(path_1.default.sep);
-    const srcDir = path_1.default.join(localAgentctl, cmdPathStr);
-    if (!await fs_extra_1.default.pathExists(srcDir)) {
-        throw new Error(`Local command ${args.join(' ')} not found`);
-    }
-    const destDir = path_1.default.join(globalRoot, cmdPathStr);
-    if (await fs_extra_1.default.pathExists(destDir)) {
-        throw new Error(`Global command ${args.join(' ')} already exists`);
-    }
-    await fs_extra_1.default.ensureDir(path_1.default.dirname(destDir));
-    if (options.move) {
-        await fs_extra_1.default.move(srcDir, destDir);
-        console.log(`Moved ${args.join(' ')} to global scope`);
-    }
-    else {
-        await fs_extra_1.default.copy(srcDir, destDir);
-        console.log(`Copied ${args.join(' ')} to global scope`);
-    }
-}
-async function pullLocal(args, options = {}) {
-    const cwd = options.cwd || process.cwd();
-    const localRoot = (0, fs_utils_1.findLocalRoot)(cwd);
-    if (!localRoot)
-        throw new Error('Not in a local context');
-    const globalRoot = options.globalDir || (0, fs_utils_1.getGlobalRoot)();
-    const cmdPathStr = args.join(path_1.default.sep);
-    const srcDir = path_1.default.join(globalRoot, cmdPathStr);
-    if (!await fs_extra_1.default.pathExists(srcDir)) {
-        throw new Error(`Global command ${args.join(' ')} not found`);
-    }
-    const localAgentctl = path_1.default.join(localRoot, '.agentctl');
-    const destDir = path_1.default.join(localAgentctl, cmdPathStr);
-    if (await fs_extra_1.default.pathExists(destDir)) {
-        throw new Error(`Local command ${args.join(' ')} already exists`);
-    }
-    await fs_extra_1.default.ensureDir(path_1.default.dirname(destDir));
-    if (options.move) {
-        await fs_extra_1.default.move(srcDir, destDir);
-        console.log(`Moved ${args.join(' ')} to local scope`);
-    }
-    else {
-        await fs_extra_1.default.copy(srcDir, destDir);
-        console.log(`Copied ${args.join(' ')} to local scope`);
-    }
-}
-const skills_1 = require("./skills");
-async function installSkill(agent, options = {}) {
-    const cwd = options.cwd || process.cwd();
-    if (!skills_1.SUPPORTED_AGENTS.includes(agent)) {
-        throw new Error(`Agent '${agent}' not supported. Supported agents: ${skills_1.SUPPORTED_AGENTS.join(', ')}`);
-    }
-    let targetDir;
-    if (agent === 'cursor') {
-        targetDir = path_1.default.join(cwd, '.cursor', 'skills');
-    }
-    else if (agent === 'antigravity') {
-        if (options.global) {
-            const globalRoot = options.antigravityGlobalDir || (0, fs_utils_1.getAntigravityGlobalRoot)();
-            targetDir = path_1.default.join(globalRoot, 'skills', 'agentctl');
-        }
-        else {
-            targetDir = path_1.default.join(cwd, '.agent', 'skills', 'agentctl');
-        }
-    }
-    else if (agent === 'agentsmd') {
-        targetDir = path_1.default.join(cwd, '.agents', 'skills', 'agentctl');
-    }
-    else if (agent === 'gemini') {
-        if (options.global) {
-            const globalRoot = options.geminiGlobalDir || path_1.default.join(process.env.HOME || process.env.USERPROFILE, '.gemini');
-            targetDir = path_1.default.join(globalRoot, 'skills', 'agentctl');
-        }
-        else {
-            targetDir = path_1.default.join(cwd, '.gemini', 'skills', 'agentctl');
-        }
-    }
-    else {
-        throw new Error(`Agent logic for '${agent}' not implemented.`);
-    }
-    const p = await (0, skills_1.copySkill)(targetDir, agent);
-    console.log(`Installed skill for ${agent} at ${p}`);
-}
-async function rm(args, options = {}) {
-    const resolved = await (0, resolve_1.resolveCommand)(args, options);
-    if (!resolved) {
-        throw new Error(`Command ${args.join(' ')} not found${options.global ? ' in global scope' : ''}`);
-    }
-    const targetDir = path_1.default.dirname(resolved.manifestPath);
-    await fs_extra_1.default.remove(targetDir);
-    console.log(`Removed ${resolved.scope} command: ${args.join(' ')}`);
-}
-async function mv(srcArgs, destArgs, options = {}) {
-    const resolved = await (0, resolve_1.resolveCommand)(srcArgs, options);
-    if (!resolved) {
-        throw new Error(`Command ${srcArgs.join(' ')} not found`);
-    }
-    const srcDir = path_1.default.dirname(resolved.manifestPath);
-    const rootDir = resolved.scope === 'local'
-        ? (0, fs_utils_1.findLocalRoot)(options.cwd || process.cwd())
-        : (options.globalDir || (0, fs_utils_1.getGlobalRoot)());
-    if (!rootDir)
-        throw new Error('Cannot determine root for move');
-    const agentctlDir = resolved.scope === 'local' ? path_1.default.join(rootDir, '.agentctl') : rootDir;
-    // For global, rootDir IS the agentctl dir (config dir). Local has .agentctl subdir.
-    const destPathStr = destArgs.join(path_1.default.sep);
-    const destDir = path_1.default.join(agentctlDir, destPathStr);
-    if (await fs_extra_1.default.pathExists(destDir)) {
-        throw new Error(`Destination ${destArgs.join(' ')} already exists`);
-    }
-    // Check parent validity (nesting under capped)
-    let current = path_1.default.dirname(destDir);
-    while (current.length >= agentctlDir.length && !isSamePath(current, path_1.default.dirname(agentctlDir))) {
-        if (await isCapped(current)) {
-            const relPath = path_1.default.relative(agentctlDir, current); // relative to base
-            throw new Error(`Cannot nest command under capped command: ${relPath}`);
-        }
-        current = path_1.default.dirname(current);
-    }
-    await fs_extra_1.default.move(srcDir, destDir);
-    // Update manifest name
-    const manifestPath = path_1.default.join(destDir, 'manifest.json');
-    if (await fs_extra_1.default.pathExists(manifestPath)) {
-        const manifest = await fs_extra_1.default.readJson(manifestPath);
-        manifest.name = destArgs[destArgs.length - 1];
-        await fs_extra_1.default.writeJson(manifestPath, manifest, { spaces: 2 });
-    }
-    console.log(`Moved ${srcArgs.join(' ')} to ${destArgs.join(' ')}`);
-}
-async function inspect(args, options = {}) {
-    const resolved = await (0, resolve_1.resolveCommand)(args, options);
-    if (!resolved) {
-        return null;
-    }
-    return {
-        manifest: resolved.manifest,
-        resolvedPath: resolved.manifestPath,
-        scope: resolved.scope
-    };
-}
-async function list(options = {}) {
-    const cwd = options.cwd || process.cwd();
-    const localRoot = (0, fs_utils_1.findLocalRoot)(cwd);
-    const globalRoot = options.globalDir || (0, fs_utils_1.getGlobalRoot)();
-    const commands = new Map();
-    async function walk(dir, prefix, scope) {
-        if (!await fs_extra_1.default.pathExists(dir))
-            return;
-        const files = await fs_extra_1.default.readdir(dir);
-        for (const file of files) {
-            const filePath = path_1.default.join(dir, file);
-            let stats;
-            try {
-                stats = await fs_extra_1.default.stat(filePath);
-            }
-            catch {
-                continue;
-            }
-            if (!stats.isDirectory())
-                continue;
-            const cmdPathParts = [...prefix, file];
-            const cmdPath = cmdPathParts.join(' ');
-            let manifest = null;
-            const mPath = path_1.default.join(filePath, 'manifest.json');
-            if (await fs_extra_1.default.pathExists(mPath)) {
-                manifest = await (0, manifest_1.readManifest)(mPath);
-            }
-            let type = 'group';
-            if (manifest) {
-                if ((0, manifest_1.isCappedManifest)(manifest)) {
-                    type = manifest.type || 'scaffold';
-                }
-                else if (manifest.type) {
-                    type = manifest.type;
-                }
-            }
-            const item = {
-                path: cmdPath,
-                type,
-                scope,
-                description: manifest?.description || ''
-            };
-            if (!commands.has(cmdPath)) {
-                commands.set(cmdPath, item);
-                const effectiveManifest = manifest || { name: file, type: 'group' };
-                if (!(0, manifest_1.isCappedManifest)(effectiveManifest)) {
-                    await walk(filePath, cmdPathParts, scope);
-                }
-            }
-            else {
-                const existing = commands.get(cmdPath);
-                if (existing && existing.scope === 'local') {
-                    if (existing.type === 'group' && type === 'group') {
-                        await walk(filePath, cmdPathParts, scope);
-                    }
-                }
-            }
-        }
-    }
-    if (localRoot) {
-        await walk(path_1.default.join(localRoot, '.agentctl'), [], 'local');
-    }
-    await walk(globalRoot, [], 'global');
-    return Array.from(commands.values());
-}
-// Helpers
-async function prepareCommand(args, options = {}) {
-    const cwd = options.cwd || process.cwd();
-    const rootDir = cwd;
-    const agentctlDir = path_1.default.join(rootDir, '.agentctl');
-    if (args.length === 0)
-        throw new Error('No command path provided');
-    const cmdPath = args.join(path_1.default.sep);
-    const targetDir = path_1.default.join(agentctlDir, cmdPath);
-    if (await fs_extra_1.default.pathExists(targetDir)) {
-        throw new Error(`Command ${args.join(' ')} already exists`);
-    }
-    let current = path_1.default.dirname(targetDir);
-    while (current.length >= agentctlDir.length && !isSamePath(current, path_1.default.dirname(agentctlDir))) {
-        if (await isCapped(current)) {
-            const relPath = path_1.default.relative(agentctlDir, current); // This uses cwd for resolution if agentctlDir is cwd resolved
-            // Need to verify relative works predictably
-            // agentctlDir comes from path.join(cwd, '.agentctl').
-            throw new Error(`Cannot nest command under capped command: ${relPath}`);
-        }
-        current = path_1.default.dirname(current);
-    }
-    await fs_extra_1.default.ensureDir(targetDir);
-    return {
-        targetDir,
-        name: args[args.length - 1],
-        isWin: process.platform === 'win32'
-    };
-}
-async function isCapped(dir) {
-    const manifestPath = path_1.default.join(dir, 'manifest.json');
-    if (await fs_extra_1.default.pathExists(manifestPath)) {
-        try {
-            const m = await fs_extra_1.default.readJson(manifestPath);
-            return (0, manifest_1.isCappedManifest)(m);
-        }
-        catch {
-            return false;
-        }
-    }
-    return false;
-}
-function isSamePath(p1, p2) {
-    return path_1.default.relative(p1, p2) === '';
-}

package/dist/src/fs-utils.js

@@ -1,35 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getGlobalRoot = getGlobalRoot;
-exports.getAntigravityGlobalRoot = getAntigravityGlobalRoot;
-exports.findLocalRoot = findLocalRoot;
-const path_1 = __importDefault(require("path"));
-const os_1 = __importDefault(require("os"));
-const fs_extra_1 = __importDefault(require("fs-extra"));
-function getGlobalRoot() {
-    if (process.platform === 'win32') {
-        return path_1.default.join(process.env.APPDATA || path_1.default.join(os_1.default.homedir(), 'AppData', 'Roaming'), 'agentctl');
-    }
-    return path_1.default.join(os_1.default.homedir(), '.config', 'agentctl');
-}
-function getAntigravityGlobalRoot() {
-    return path_1.default.join(os_1.default.homedir(), '.gemini', 'antigravity');
-}
-function findLocalRoot(cwd = process.cwd()) {
-    let current = path_1.default.resolve(cwd);
-    const root = path_1.default.parse(current).root;
-    // Safety break and root check
-    // Using for(;;) to avoid no-constant-condition
-    for (;;) {
-        if (fs_extra_1.default.existsSync(path_1.default.join(current, '.agentctl'))) {
-            return current;
-        }
-        if (current === root) {
-            return null;
-        }
-        current = path_1.default.dirname(current);
-    }
-}