@way_marks/cli 4.0.2 → 4.3.0

package/dist/commands/agents.js

@@ -0,0 +1,189 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.run = run;
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
+const http = __importStar(require("http"));
+// ─── Helpers ──────────────────────────────────────────────────────────────────
+function getPort() {
+    const projectRoot = process.cwd();
+    const configPath = path.join(projectRoot, '.waymark', 'config.json');
+    if (!fs.existsSync(configPath))
+        return null;
+    try {
+        const cfg = JSON.parse(fs.readFileSync(configPath, 'utf8'));
+        return cfg.port ?? null;
+    }
+    catch {
+        return null;
+    }
+}
+function fetchJson(url) {
+    return new Promise((resolve, reject) => {
+        const req = http.get(url, { headers: { Accept: 'application/json' } }, (res) => {
+            let data = '';
+            res.on('data', (chunk) => { data += chunk; });
+            res.on('end', () => {
+                try {
+                    resolve(JSON.parse(data));
+                }
+                catch {
+                    reject(new Error(`Invalid JSON from ${url}`));
+                }
+            });
+        });
+        req.setTimeout(3000, () => { req.destroy(); reject(new Error('Request timed out')); });
+        req.on('error', reject);
+    });
+}
+function ageStr(ms) {
+    const secs = Math.floor((Date.now() - ms) / 1000);
+    if (secs < 60)
+        return `${secs}s`;
+    if (secs < 3600)
+        return `${Math.floor(secs / 60)}m`;
+    return `${Math.floor(secs / 3600)}h`;
+}
+function pad(s, w) {
+    return s.length >= w ? s.slice(0, w) : s + ' '.repeat(w - s.length);
+}
+function statusIcon(status) {
+    switch (status) {
+        case 'thinking': return '🤔';
+        case 'waiting': return '⏳';
+        case 'done': return '✅';
+        case 'error': return '❌';
+        default: return '❔';
+    }
+}
+// ─── Parse args ───────────────────────────────────────────────────────────────
+function parseArgs(argv) {
+    let agent = 'all';
+    let active = false;
+    let json = false;
+    let limit = 20;
+    for (let i = 0; i < argv.length; i++) {
+        if (argv[i] === '--agent' && argv[i + 1]) {
+            agent = argv[++i];
+            continue;
+        }
+        if (argv[i] === '--active') {
+            active = true;
+            continue;
+        }
+        if (argv[i] === '--json') {
+            json = true;
+            continue;
+        }
+        if (argv[i] === '--limit' && argv[i + 1]) {
+            limit = parseInt(argv[++i], 10) || 20;
+            continue;
+        }
+    }
+    return { agent, active, json, limit };
+}
+// ─── Main ─────────────────────────────────────────────────────────────────────
+async function run() {
+    const args = parseArgs(process.argv.slice(3));
+    // Find port
+    const envPort = process.env.WAYMARK_PORT;
+    const port = envPort ? parseInt(envPort, 10) : getPort();
+    if (!port) {
+        console.error('Waymark not initialized. Run: npx @way_marks/cli init && npx @way_marks/cli start');
+        process.exit(1);
+    }
+    const base = `http://localhost:${port}/api/agent-monitor`;
+    let qs = '';
+    if (args.agent !== 'all')
+        qs += `agent=${encodeURIComponent(args.agent)}&`;
+    if (args.active)
+        qs += 'status=active&';
+    const url = `${base}/sessions${qs ? '?' + qs.replace(/&$/, '') : ''}`;
+    let data;
+    try {
+        data = await fetchJson(url);
+    }
+    catch (err) {
+        console.error(`Cannot reach Waymark server on port ${port}: ${err.message}`);
+        console.error('Start it with: npx @way_marks/cli start');
+        process.exit(1);
+    }
+    const sessions = data.sessions.slice(0, args.limit);
+    if (args.json) {
+        console.log(JSON.stringify(sessions, null, 2));
+        return;
+    }
+    if (sessions.length === 0) {
+        console.log('No agent sessions found.');
+        if (args.agent !== 'all')
+            console.log(`(filtered by --agent ${args.agent})`);
+        if (args.active)
+            console.log('(filtered by --active)');
+        return;
+    }
+    // ── Table output ─────────────────────────────────────────────────────────────
+    const COL = { agent: 8, pid: 7, status: 9, ctx: 7, tokens: 9, task: 32, age: 6 };
+    const header = [
+        pad('Agent', COL.agent),
+        pad('PID', COL.pid),
+        pad('Status', COL.status),
+        pad('Ctx %', COL.ctx),
+        pad('Tokens', COL.tokens),
+        pad('Current task', COL.task),
+        pad('Age', COL.age),
+    ].join('  ');
+    const divider = '─'.repeat(header.length);
+    console.log(`\nAgent sessions — ${data.count} total${args.limit < data.count ? ` (showing ${args.limit})` : ''}`);
+    console.log(divider);
+    console.log(header);
+    console.log(divider);
+    for (const s of sessions) {
+        const tokens = s.totalInputTokens + s.totalOutputTokens;
+        const task = s.currentTasks?.[0] ?? '—';
+        const row = [
+            pad(s.agentCli, COL.agent),
+            pad(String(s.pid), COL.pid),
+            `${statusIcon(s.status)} ${pad(s.status, COL.status - 2)}`,
+            pad(`${Math.round(s.contextPercent)}%`, COL.ctx),
+            pad(tokens > 0 ? String(tokens) : '—', COL.tokens),
+            pad(task.length > COL.task ? task.slice(0, COL.task - 1) + '…' : task, COL.task),
+            pad(ageStr(s.startedAt), COL.age),
+        ].join('  ');
+        console.log(row);
+    }
+    console.log(divider);
+    console.log(`Dashboard: http://localhost:${port}`);
+}

package/dist/commands/init.js

@@ -47,7 +47,8 @@ const DEFAULT_CONFIG = {
             './src/**',
             './data/**',
             './README.md',
-            './CLAUDE.md'
+            './CLAUDE.md',
+            './COPILOT.md'
         ],
         blockedPaths: [
             './.env',
@@ -152,6 +153,68 @@ function prompt(question) {
         rl.question(question, answer => { rl.close(); resolve(answer.trim()); });
     });
 }
+function generateCopilotMd(projectName) {
+    return `---
+# ⚠️ WAYMARK ACTIVE — MANDATORY INSTRUCTIONS
+
+## You are operating under Waymark agent control
+
+Waymark is active in this project (${projectName}).
+All file and shell operations MUST go through
+Waymark MCP tools. No exceptions.
+
+## MANDATORY tool usage
+
+You MUST replace ALL built-in file and shell
+operations with Waymark MCP equivalents:
+
+| Operation              | Built-in (DO NOT USE) | Waymark (ALWAYS USE) |
+|------------------------|-----------------------|----------------------|
+| Write or edit a file   | write_file            | mcp__waymark-${projectName}__write_file |
+| Read a file            | read_file             | mcp__waymark-${projectName}__read_file  |
+| Run shell commands     | bash / run_command    | mcp__waymark-${projectName}__bash       |
+
+This applies to ALL tasks in this project —
+refactoring, creating files, running tests,
+installing packages, git operations, everything.
+
+## What Waymark does with each action
+
+- Allowed paths → executes normally, logged
+- Blocked paths → stopped, you will see why
+- Sensitive paths → held for human approval,
+  do not retry, tell the user to check dashboard
+
+## If a Waymark tool returns a block decision
+
+Accept the block. Do not attempt to work around it
+using built-in tools. Tell the user what was blocked
+and why. Suggest they update waymark.config.json
+if the block was unintended.
+
+## If Waymark MCP tools are unavailable
+
+Do NOT fall back to built-in file tools.
+Stop and tell the user:
+
+"Waymark MCP server is not running for this project.
+Please run in your terminal:
+  npx @way_marks/cli start
+
+Then restart GitHub Copilot CLI and try again."
+
+## Dashboard
+
+All actions are visible at: http://localhost:3001
+Approve pending actions there.
+Roll back any write there.
+
+## This file was generated by Waymark
+Do not delete or modify this file.
+It controls how GitHub Copilot CLI behaves in this project.
+---
+`;
+}
 function getClaudeDesktopConfigPath() {
     const platform = process.platform;
     if (platform === 'darwin') {
@@ -164,6 +227,10 @@ function getClaudeDesktopConfigPath() {
         return path.join(os.homedir(), '.config', 'Claude', 'claude_desktop_config.json');
     }
 }
+/** Path to GitHub Copilot CLI's MCP config file. */
+function getCopilotMcpConfigPath() {
+    return path.join(os.homedir(), '.copilot', 'mcp-config.json');
+}
 function resolveServerBin() {
     try {
         return require.resolve('@way_marks/server/dist/mcp/server.js');
@@ -180,8 +247,8 @@ async function selectPlatforms() {
     console.log('│ 1. Claude Desktop / Claude Code (RECOMMENDED) ✓       │');
     console.log('│    → Best experience. Full Waymark features.          │');
     console.log('│                                                       │');
-    console.log('│ 2. GitHub Copilot CLI (EXPERIMENTAL) ⚠               │');
-    console.log('│    → Terminal support. CLI-only (no VSCode).          │');
+    console.log('│ 2. GitHub Copilot CLI ✓                               │');
+    console.log('│    → MCP-native. Full monitoring + policy control.    │');
     console.log('│                                                       │');
     console.log('│ 3. Both (Claude + GitHub Copilot CLI)                 │');
     console.log('│    → Setup for both. Easy to switch.                  │');
@@ -298,8 +365,8 @@ async function run() {
         console.log('✓ .gitignore already up to date');
     }
     // Step 6 — Register MCP in both Claude configs (only if Claude selected)
+    const nodeBin = process.execPath;
     if (selectedPlatforms.includes('claude')) {
-        const nodeBin = process.execPath;
         const mcpEntry = {
             command: nodeBin,
             args: [serverBin, '--project-root', projectRoot, '--db-path', dbPath]
@@ -341,21 +408,53 @@ async function run() {
     else {
         console.log('⊘ Skipping MCP registration (Claude not selected)');
     }
-    // Step 6b — Show Copilot CLI instructions (if Copilot CLI selected)
+    // Step 6b — Register Copilot CLI MCP + generate COPILOT.md (if Copilot CLI selected)
     if (selectedPlatforms.includes('copilot-cli')) {
-        console.log('');
-        console.log('📋 GitHub Copilot CLI Setup');
-        console.log('─'.repeat(50));
-        console.log('⚠️  Copilot CLI support requires manual setup.');
-        console.log('See COPILOT_CLI.md for step-by-step instructions.');
-        console.log('');
-        console.log('Quick start:');
-        console.log('1. Find copilot binary: which copilot');
-        console.log('2. Run: npx @way_marks/cli init-copilot-wrapper');
-        console.log('3. Test: copilot --version');
-        console.log('');
+        // Register in ~/.copilot/mcp-config.json (user-level, applies to all projects)
+        const copilotMcpPath = getCopilotMcpConfigPath();
+        try {
+            const copilotMcpDir = path.dirname(copilotMcpPath);
+            if (!fs.existsSync(copilotMcpDir))
+                fs.mkdirSync(copilotMcpDir, { recursive: true });
+            const copilotMcpConfig = fs.existsSync(copilotMcpPath)
+                ? JSON.parse(fs.readFileSync(copilotMcpPath, 'utf8'))
+                : { mcpServers: {} };
+            if (!copilotMcpConfig.mcpServers)
+                copilotMcpConfig.mcpServers = {};
+            copilotMcpConfig.mcpServers[mcpKey] = {
+                type: 'local',
+                command: nodeBin,
+                args: [serverBin, '--project-root', projectRoot, '--db-path', dbPath],
+                tools: ['*'],
+            };
+            fs.writeFileSync(copilotMcpPath, JSON.stringify(copilotMcpConfig, null, 2) + '\n');
+            console.log(`✓ Registered MCP server "${mcpKey}" in ~/.copilot/mcp-config.json`);
+        }
+        catch (err) {
+            console.warn(`Warning: Could not update Copilot CLI MCP config: ${err.message}`);
+        }
+        // Generate COPILOT.md (like CLAUDE.md — tells Copilot CLI to use Waymark tools)
+        const copilotMdPath = path.join(projectRoot, 'COPILOT.md');
+        const copilotMdContent = generateCopilotMd(projectName);
+        if (fs.existsSync(copilotMdPath)) {
+            const existing = fs.readFileSync(copilotMdPath, 'utf8');
+            if (existing.includes(WAYMARK_MARKER)) {
+                console.log('✓ COPILOT.md already has Waymark section');
+            }
+            else {
+                fs.appendFileSync(copilotMdPath, `\n${WAYMARK_MARKER}\n${copilotMdContent}`);
+                console.log('✓ Appended Waymark section to COPILOT.md');
+            }
+        }
+        else {
+            fs.writeFileSync(copilotMdPath, `${WAYMARK_MARKER}\n${copilotMdContent}`);
+            console.log('✓ Created COPILOT.md — GitHub Copilot CLI will now use Waymark automatically');
+        }
+    }
+    else {
+        console.log('⊘ Skipping Copilot CLI registration (not selected)');
     }
-    // Step 7 — Success summary (updated for platform selection)
+    // Step 7 — Success summary
     const col = 50;
     const pad = (s) => s + ' '.repeat(Math.max(0, col - 2 - s.length));
     console.log('');
@@ -367,12 +466,14 @@ async function run() {
     console.log(`│ ${pad(`Platforms: ${selectedPlatforms.join(', ')}`)} │`);
     console.log(`│ ${pad('')} │`);
     console.log(`│ ${pad('Files created:')} │`);
-    console.log(`│ ${pad('  waymark.config.json (with platforms)')} │`);
+    console.log(`│ ${pad('  waymark.config.json')} │`);
     if (selectedPlatforms.includes('claude')) {
         console.log(`│ ${pad('  CLAUDE.md')} │`);
+        console.log(`│ ${pad('  .mcp.json')} │`);
     }
     if (selectedPlatforms.includes('copilot-cli')) {
-        console.log(`│ ${pad('  (see COPILOT_CLI.md setup)')} │`);
+        console.log(`│ ${pad('  COPILOT.md')} │`);
+        console.log(`│ ${pad('  ~/.copilot/mcp-config.json (updated)')} │`);
     }
     console.log(`│ ${pad('  .waymark/ (gitignored)')} │`);
     console.log(`│ ${pad('')} │`);
@@ -388,7 +489,9 @@ async function run() {
             console.log(`│ ${pad('')} │`);
         }
         console.log(`│ ${pad('Next steps (Copilot CLI):')} │`);
-        console.log(`│ ${pad('1. See COPILOT_CLI.md for wrapper setup')} │`);
+        console.log(`│ ${pad('1. Run: npx @way_marks/cli start')} │`);
+        console.log(`│ ${pad('2. Restart GitHub Copilot CLI')} │`);
+        console.log(`│ ${pad('3. Open project with: copilot')} │`);
     }
     console.log(`│ ${pad('')} │`);
     console.log(`│ ${pad('For more info:')} │`);

package/dist/index.js

@@ -29,6 +29,7 @@ function printHelp() {
     console.log('  resume                Resume a paused project');
     console.log('  status                Show current Waymark status and pending count');
     console.log('  logs                  Show recent action log');
+    console.log('  agents                List running AI agent sessions');
     console.log('  list                  List all registered Waymark projects');
     console.log('  open                  Open a project dashboard or start it');
     console.log('');
@@ -74,6 +75,9 @@ switch (command) {
     case 'logs':
         require('./commands/logs').run();
         break;
+    case 'agents':
+        require('./commands/agents').run();
+        break;
     case 'list':
         require('./commands/list').run();
         break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@way_marks/cli",
-  "version": "4.0.2",
+  "version": "4.3.0",
   "description": "Control what AI agents can do in your codebase",
   "author": "Waymark <hello@waymarks.dev>",
   "license": "MIT",
@@ -43,7 +43,7 @@
     ]
   },
   "dependencies": {
-    "@way_marks/server": "4.0.2"
+    "@way_marks/server": "4.3.0"
   },
   "devDependencies": {
     "@types/jest": "^30.0.0",