morpheus-cli 0.8.9 → 0.9.0

package/dist/runtime/__tests__/keymaker.test.js

@@ -32,12 +32,15 @@ vi.mock('../display.js', () => ({
         })),
     },
 }));
-vi.mock('../../devkit/index.js', () => ({
+vi.mock('morpheus-devkit', () => ({
     buildDevKit: vi.fn(() => [
         { name: 'fs_read', description: 'Read file' },
         { name: 'shell_exec', description: 'Execute shell command' },
     ]),
 }));
+vi.mock('../devkit-instrument.js', () => ({
+    instrumentDevKitTools: vi.fn((tools) => tools),
+}));
 vi.mock('../tools/factory.js', () => ({
     Construtor: {
         create: vi.fn(() => Promise.resolve([
@@ -97,7 +100,7 @@ describe('Keymaker', () => {
     describe('initialize()', () => {
         it('should initialize agent with all tools', async () => {
             const { ProviderFactory } = await import('../providers/factory.js');
-            const { buildDevKit } = await import('../../devkit/index.js');
+            const { buildDevKit } = await import('morpheus-devkit');
             const { Construtor } = await import('../tools/factory.js');
             const keymaker = new Keymaker('test-skill', '# Instructions');
             await keymaker.initialize();

package/dist/runtime/apoc.js

@@ -3,7 +3,8 @@ import { ConfigManager } from "../config/manager.js";
 import { ProviderFactory } from "./providers/factory.js";
 import { ProviderError } from "./errors.js";
 import { DisplayManager } from "./display.js";
-import { buildDevKit } from "../devkit/index.js";
+import { buildDevKit } from "morpheus-devkit";
+import { instrumentDevKitTools } from "./devkit-instrument.js";
 import { extractRawUsage, persistAgentMessage, buildAgentResult, emitToolAuditEvents } from "./subagent-utils.js";
 import { buildDelegationTool } from "./tools/delegation-utils.js";
 /**
@@ -47,9 +48,9 @@ export class Apoc {
         const devkit = ConfigManager.getInstance().getDevKitConfig();
         const timeout_ms = devkit.timeout_ms || this.config.apoc?.timeout_ms || 30_000;
         const personality = this.config.apoc?.personality || 'pragmatic_dev';
-        // Import all devkit tool factories (side-effect registration)
-        await import("../devkit/index.js");
-        const tools = buildDevKit({
+        // Import morpheus-devkit to trigger side-effect tool registration
+        await import("morpheus-devkit");
+        const rawTools = buildDevKit({
             working_dir: devkit.sandbox_dir || process.cwd(),
             allowed_commands: devkit.allowed_shell_commands || [],
             timeout_ms,
@@ -59,9 +60,8 @@ export class Apoc {
             enable_shell: devkit.enable_shell,
             enable_git: devkit.enable_git,
             enable_network: devkit.enable_network,
-            getSessionId: () => Apoc.currentSessionId,
-            getAgent: () => 'apoc',
         });
+        const tools = instrumentDevKitTools(rawTools, () => Apoc.currentSessionId, () => 'apoc');
         this.display.log(`Apoc initialized with ${tools.length} DevKit tools (sandbox_dir: ${devkit.sandbox_dir}, personality: ${personality})`, { source: "Apoc" });
         try {
             this.agent = await ProviderFactory.createBare(apocConfig, tools);

package/dist/{devkit/registry.js → runtime/devkit-instrument.js}

@@ -1,15 +1,4 @@
-import { AuditRepository } from '../runtime/audit/repository.js';
-const factories = [];
-export function registerToolFactory(factory, category = 'system') {
-    factories.push({ category, factory });
-}
-/** Categories that can be toggled off via DevKit config */
-const TOGGLEABLE_CATEGORIES = {
-    filesystem: 'enable_filesystem',
-    shell: 'enable_shell',
-    git: 'enable_git',
-    network: 'enable_network',
-};
+import { AuditRepository } from './audit/repository.js';
 /**
  * Wraps a StructuredTool to record audit events on each invocation.
  * The `getSessionId` getter is called at invocation time so it reflects
@@ -51,22 +40,9 @@ function instrumentTool(tool, getSessionId, getAgent) {
     return tool;
 }
 /**
- * Builds the full DevKit tool set for a given context.
- * Each factory receives the context (working_dir, allowed_commands, etc.)
- * and returns tools with the context captured in closure.
- * Disabled categories are filtered out based on context flags.
- * All tools are wrapped with audit instrumentation.
+ * Wraps all DevKit tools with audit instrumentation.
+ * Call this after buildDevKit() to add Morpheus audit tracking.
  */
-export function buildDevKit(ctx) {
-    const getSessionId = ctx.getSessionId ?? (() => undefined);
-    const getAgent = ctx.getAgent ?? (() => 'apoc');
-    return factories
-        .filter(({ category }) => {
-        const ctxKey = TOGGLEABLE_CATEGORIES[category];
-        if (!ctxKey)
-            return true; // non-toggleable categories always load
-        return ctx[ctxKey] !== false;
-    })
-        .flatMap(({ factory }) => factory(ctx))
-        .map(tool => instrumentTool(tool, getSessionId, getAgent));
+export function instrumentDevKitTools(tools, getSessionId, getAgent) {
+    return tools.map(tool => instrumentTool(tool, getSessionId, getAgent));
 }

package/dist/runtime/keymaker.js

@@ -3,7 +3,8 @@ import { ConfigManager } from "../config/manager.js";
 import { ProviderFactory } from "./providers/factory.js";
 import { ProviderError } from "./errors.js";
 import { DisplayManager } from "./display.js";
-import { buildDevKit } from "../devkit/index.js";
+import { buildDevKit } from "morpheus-devkit";
+import { instrumentDevKitTools } from "./devkit-instrument.js";
 import { Construtor } from "./tools/factory.js";
 import { morpheusTools } from "./tools/index.js";
 import { SkillRegistry } from "./skills/registry.js";
@@ -36,8 +37,8 @@ export class Keymaker {
         // Build DevKit tools (filesystem, shell, git, browser, network, etc.)
         const devkit = ConfigManager.getInstance().getDevKitConfig();
         const timeout_ms = devkit.timeout_ms || 30_000;
-        await import("../devkit/index.js");
-        const devKitTools = buildDevKit({
+        await import("morpheus-devkit");
+        const devKitTools = instrumentDevKitTools(buildDevKit({
             working_dir: devkit.sandbox_dir || process.cwd(),
             allowed_commands: devkit.allowed_shell_commands || [],
             timeout_ms,
@@ -47,7 +48,7 @@ export class Keymaker {
             enable_shell: devkit.enable_shell,
             enable_git: devkit.enable_git,
             enable_network: devkit.enable_network,
-        });
+        }), () => undefined, () => 'keymaker');
         // Load MCP tools from configured servers
         const mcpTools = await Construtor.create();
         // Combine all tools

package/dist/runtime/smiths/delegator.js

@@ -5,7 +5,7 @@ import { DisplayManager } from '../display.js';
 import { SmithRegistry } from './registry.js';
 import { ConfigManager } from '../../config/manager.js';
 import { ProviderFactory } from '../providers/factory.js';
-import { buildDevKit } from '../../devkit/index.js';
+import { buildDevKit } from 'morpheus-devkit';
 import { SQLiteChatMessageHistory } from '../memory/sqlite.js';
 import { AuditRepository } from '../audit/repository.js';
 import { TaskRequestContext } from '../tasks/context.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "morpheus-cli",
-  "version": "0.8.9",
+  "version": "0.9.0",
   "description": "Morpheus is a local AI agent for developers, running as a CLI daemon that connects to LLMs, local tools, and MCPs, enabling interaction via Terminal, Telegram, and Discord. Inspired by the character Morpheus from *The Matrix*, the project acts as an intelligent orchestrator, bridging the gap between the developer and complex systems.",
   "bin": {
     "morpheus": "./bin/morpheus.js"
@@ -61,6 +61,7 @@
     "mcp-remote": "^0.1.38",
     "mongodb": "^6.21.0",
     "mongoose": "^8.23.0",
+    "morpheus-devkit": "^1.0.0",
     "multer": "^2.0.2",
     "music-metadata": "^11.12.1",
     "mysql2": "^3.17.4",

package/dist/devkit/adapters/shell.js

@@ -1,80 +0,0 @@
-import { platform } from 'os';
-export class ShellAdapter {
-    /**
-     * Factory: returns the appropriate adapter for the current OS.
-     * Uses direct imports (ESM-compatible, no require()).
-     */
-    static create() {
-        switch (platform()) {
-            case 'win32': return new WindowsAdapter();
-            case 'darwin': return new MacAdapter();
-            default: return new LinuxAdapter();
-        }
-    }
-}
-// ─── Inline implementations (avoids ESM dynamic import issues) ────────────────
-import { spawn } from 'child_process';
-class WindowsAdapter extends ShellAdapter {
-    getShell() { return { shell: 'cmd.exe', flag: '/c' }; }
-    async run(command, args, options) {
-        return spawnCommand(command, args, { ...options, windowsHide: true, shell: true });
-    }
-    async which(binary) {
-        const result = await this.run('where', [binary], { cwd: process.cwd(), timeout_ms: 5000 });
-        if (result.exitCode !== 0)
-            return null;
-        const first = result.stdout.trim().split(/\r?\n/)[0];
-        return first || null;
-    }
-}
-class LinuxAdapter extends ShellAdapter {
-    getShell() { return { shell: '/bin/bash', flag: '-c' }; }
-    async run(command, args, options) {
-        return spawnCommand(command, args, { ...options, shell: false });
-    }
-    async which(binary) {
-        const result = await this.run('which', [binary], { cwd: process.cwd(), timeout_ms: 5000 });
-        if (result.exitCode !== 0)
-            return null;
-        return result.stdout.trim() || null;
-    }
-}
-class MacAdapter extends ShellAdapter {
-    getShell() { return { shell: '/bin/zsh', flag: '-c' }; }
-    async run(command, args, options) {
-        return spawnCommand(command, args, { ...options, shell: false });
-    }
-    async which(binary) {
-        const result = await this.run('which', [binary], { cwd: process.cwd(), timeout_ms: 5000 });
-        if (result.exitCode !== 0)
-            return null;
-        return result.stdout.trim() || null;
-    }
-}
-function spawnCommand(command, args, options) {
-    return new Promise((resolve) => {
-        let stdout = '';
-        let stderr = '';
-        let timedOut = false;
-        const child = spawn(command, args, {
-            cwd: options.cwd,
-            env: { ...process.env, ...options.env },
-            shell: options.shell ?? false,
-            windowsHide: options.windowsHide ?? false,
-        });
-        const timer = setTimeout(() => {
-            timedOut = true;
-            child.kill('SIGKILL');
-        }, options.timeout_ms);
-        child.stdout?.on('data', (d) => { stdout += d.toString(); });
-        child.stderr?.on('data', (d) => { stderr += d.toString(); });
-        child.on('error', (err) => {
-            clearTimeout(timer);
-            resolve({ exitCode: 1, stdout, stderr: stderr + err.message, timedOut });
-        });
-        child.on('close', (code) => {
-            clearTimeout(timer);
-            resolve({ exitCode: code ?? 1, stdout, stderr, timedOut });
-        });
-    });
-}

package/dist/devkit/index.js

@@ -1,11 +0,0 @@
-// Register all DevKit tool factories
-// Import order matters: each import triggers registerToolFactory() as a side effect
-import './tools/filesystem.js';
-import './tools/shell.js';
-import './tools/processes.js';
-import './tools/network.js';
-import './tools/git.js';
-import './tools/packages.js';
-import './tools/system.js';
-import './tools/browser.js';
-export { buildDevKit } from './registry.js';