monomind 2.0.2 → 2.1.0

package/packages/@monomind/cli/dist/src/commands/org.d.ts

@@ -1,4 +1,6 @@
 import type { Command } from '../types.js';
-declare const orgCommand: Command;
+/** Remove a lingering stopfile so a fresh `org run` doesn't self-terminate. */
+export declare const clearStopfile: (cwd: string, name: string) => void;
+export declare const orgCommand: Command;
 export default orgCommand;
 //# sourceMappingURL=org.d.ts.map

package/packages/@monomind/cli/dist/src/commands/org.js

@@ -1,144 +1,321 @@
+// packages/@monomind/cli/src/commands/org.ts
+import { readFileSync, existsSync, unlinkSync, rmSync, readdirSync } from 'node:fs';
+import { join, resolve } from 'node:path';
 import { output } from '../output.js';
-import { existsSync, unlinkSync, rmSync, readdirSync, readFileSync } from 'fs';
-import { join, resolve } from 'path';
-const orgCommand = {
-    name: 'org',
-    description: 'Manage monomind organisations',
-    examples: [
-        { command: 'monomind org list', description: 'List all orgs in the project' },
-        { command: 'monomind org delete my-org', description: 'Delete an org (with confirmation)' },
-        { command: 'monomind org delete my-org --yes', description: 'Delete without confirmation' },
-        { command: 'monomind org mark-complete my-org', description: 'Manually close a STALE run (crashed boss recovery)' },
-    ],
-    action: async (context) => {
-        const args = context.args ?? [];
-        const sub = args[0];
-        if (!sub || sub === 'help') {
-            output.info('Usage: monomind org <subcommand>');
-            output.info('');
-            output.info('Subcommands:');
-            output.info('  list                   List all orgs in the current project');
-            output.info('  delete <name>          Delete an org and all its data');
-            output.info('  mark-complete <name>   Manually close a stale/crashed run');
-            return { success: true };
-        }
-        if (sub === 'mark-complete') {
-            const orgName = args[1];
-            if (!orgName || !/^[a-z0-9][a-z0-9_-]*$/i.test(orgName)) {
-                output.error('Usage: monomind org mark-complete <name>');
-                return { success: false, message: 'valid org name required' };
-            }
-            const cwd = resolve(context.cwd || process.cwd());
-            let ctrlUrl = 'http://localhost:4242';
-            try {
-                const ctl = JSON.parse(readFileSync(join(cwd, '.monomind', 'control.json'), 'utf8'));
-                if (ctl.url)
-                    ctrlUrl = ctl.url;
-            }
-            catch { /* default */ }
+import { OrgDaemon } from '../orgrt/daemon.js';
+import { startOrgServer } from '../orgrt/server.js';
+import { ORG_DIR } from '../orgrt/types.js';
+const log = (text) => { console.log(text); };
+/** Org names are used to build filesystem paths under .monomind/orgs — reject
+ * anything that isn't a plain identifier to prevent path traversal (e.g.
+ * `monomind org stop '../../../../tmp/x'`). */
+const ORG_NAME_RE = /^[a-z0-9][a-z0-9_-]*$/i;
+function validateOrgName(name) {
+    if (!name)
+        return { ok: false, result: { success: false, message: 'org name required' } };
+    if (!ORG_NAME_RE.test(name)) {
+        log(output.error(`Invalid org name: ${name}`));
+        return { ok: false, result: { success: false, message: 'invalid org name' } };
+    }
+    return { ok: true, name };
+}
+/** Config filenames for real orgs under orgsDir — excludes org-internal
+ * artifact files (state/goals/threads/etc) that share the .json extension. */
+const ORG_ARTIFACT_SUFFIXES = ['-state', '-goals', '-threads', '-activity', '-approvals', '-members', '-secrets', '-budgets'];
+function listOrgConfigFiles(orgsDir) {
+    return readdirSync(orgsDir)
+        .filter(f => f.endsWith('.json') && !ORG_ARTIFACT_SUFFIXES.some(suf => f.includes(suf)));
+}
+/** Remove a lingering stopfile so a fresh `org run` doesn't self-terminate. */
+export const clearStopfile = (cwd, name) => {
+    rmSync(join(cwd, ORG_DIR, name, 'stop'), { force: true });
+};
+const runAction = async (ctx) => {
+    if (!ctx.args[0])
+        return { success: false, message: 'org name required: monomind org run <name> [--task "..."] [--serve] [--port N]' };
+    const validated = validateOrgName(ctx.args[0]);
+    if (!validated.ok)
+        return validated.result;
+    const name = validated.name;
+    const crossProcess = ctx.flags['crossProcess'] !== false;
+    const daemon = new OrgDaemon(ctx.cwd, { crossProcess });
+    let srv;
+    if (ctx.flags['serve'] !== false) {
+        const port = Number(ctx.flags['port'] ?? 4243);
+        srv = await startOrgServer(daemon, port);
+        log(output.info(`org live view: http://localhost:${srv.port}`));
+        if (crossProcess)
+            daemon.setInboxUrl(`http://127.0.0.1:${srv.port}`);
+    }
+    const running = await daemon.startOrg(name, ctx.flags['task']);
+    log(output.info(`org ${name} running (${running.def.roles.length} agents, run ${running.run}) — Ctrl-C or "monomind org stop ${name}" to stop`));
+    // stopfile poll lets `org stop` work from another terminal;
+    // clear any stale stopfile from a previous run before polling
+    clearStopfile(ctx.cwd, name);
+    const stopfile = join(ctx.cwd, ORG_DIR, name, 'stop');
+    await new Promise(resolvePromise => {
+        const iv = setInterval(() => { if (existsSync(stopfile)) {
+            clearInterval(iv);
+            resolvePromise();
+        } }, 2000);
+        process.once('SIGINT', () => { clearInterval(iv); resolvePromise(); });
+        process.once('SIGTERM', () => { clearInterval(iv); resolvePromise(); });
+    });
+    clearStopfile(ctx.cwd, name);
+    await daemon.stopAll();
+    srv?.close();
+    return { success: true, message: `org ${name} stopped` };
+};
+const stopAction = async (ctx) => {
+    const validated = validateOrgName(ctx.args[0]);
+    if (!validated.ok)
+        return validated.result;
+    const name = validated.name;
+    const { writeFileSync, mkdirSync } = await import('node:fs');
+    mkdirSync(join(ctx.cwd, ORG_DIR, name), { recursive: true });
+    writeFileSync(join(ctx.cwd, ORG_DIR, name, 'stop'), new Date().toISOString());
+    return { success: true, message: `stop requested for ${name} (daemon exits within 2s)` };
+};
+const statusAction = async (ctx) => {
+    const name = ctx.args[0];
+    const orgDir = join(ctx.cwd, ORG_DIR);
+    const targets = name ? [name] : (existsSync(orgDir)
+        ? listOrgConfigFiles(orgDir).map(f => f.replace(/\.json$/, ''))
+        : []);
+    for (const t of targets) {
+        const rt = join(orgDir, t, 'runtime.json');
+        let state = { status: 'never run' };
+        if (existsSync(rt)) {
             try {
-                const res = await fetch(`${ctrlUrl}/api/orgs/${encodeURIComponent(orgName)}/mark-complete`, { method: 'POST' });
-                const body = await res.json().catch(() => ({}));
-                if (!res.ok) {
-                    output.error(`mark-complete failed (${res.status}): ${body.error || 'unknown error'}`);
-                    return { success: false, message: 'server rejected mark-complete' };
-                }
-                output.success(`Run marked complete for org "${orgName}"${body.runId ? ` (run ${body.runId})` : ''}.`);
-                return { success: true };
+                state = JSON.parse(readFileSync(rt, 'utf8'));
             }
             catch (err) {
-                output.error(`Dashboard server unreachable at ${ctrlUrl} — is it running? (${err instanceof Error ? err.message : 'error'})`);
-                return { success: false, message: 'server unreachable' };
+                log(output.warning(`${t}: could not read runtime.json (${err instanceof Error ? err.message : 'corrupt/truncated file'})`));
+                continue;
             }
         }
-        if (sub === 'list') {
-            const cwd = context.cwd || process.cwd();
-            const orgsDir = join(cwd, '.monomind', 'orgs');
-            if (!existsSync(orgsDir)) {
-                output.info('No orgs directory found. Create an org first with /mastermind:createorg');
-                return { success: true };
-            }
-            const configs = readdirSync(orgsDir)
-                .filter(f => f.endsWith('.json') && !f.includes('-state') && !f.includes('-goals')
-                && !f.includes('-threads') && !f.includes('-activity') && !f.includes('-approvals')
-                && !f.includes('-members') && !f.includes('-secrets') && !f.includes('-budgets'));
-            if (!configs.length) {
-                output.info('No orgs found.');
-                return { success: true };
-            }
-            output.info(`Found ${configs.length} org(s):`);
-            for (const f of configs)
-                output.info(`  • ${f.replace('.json', '')}`);
-            return { success: true };
+        log(output.info(`${t}: ${state.status}${state.run ? ` (run ${state.run}, pid ${state.pid})` : ''}`));
+    }
+    return { success: true };
+};
+const serveAction = async (ctx) => {
+    const crossProcess = ctx.flags['crossProcess'] !== false;
+    const daemon = new OrgDaemon(ctx.cwd, { crossProcess });
+    const srv = await startOrgServer(daemon, Number(ctx.flags['port'] ?? 4243));
+    log(output.info(`org daemon serving on http://localhost:${srv.port} — Ctrl-C to stop`));
+    if (crossProcess)
+        daemon.setInboxUrl(`http://127.0.0.1:${srv.port}`);
+    // schedule orgs whose definition declares an interval (e.g. "15m", "2h")
+    const { OrgScheduler, parseSchedule } = await import('../orgrt/scheduler.js');
+    const sched = new OrgScheduler(async (name, intervalMs) => {
+        try {
+            await daemon.startOrg(name);
+            // Scheduled iterations are time-bounded: agents' `done` promises only
+            // resolve after stopOrg closes the mailboxes, so waiting on them alone
+            // deadlocks. Race against a max-run timeout, then ALWAYS stopOrg
+            // (idempotent — it resolves `done` and flushes).
+            const org = daemon.getOrg(name);
+            const allDone = org
+                ? Promise.allSettled([...org.agents.values()].map(a => a.done))
+                : Promise.resolve([]);
+            const maxRun = org?.def?.run_config?.max_run;
+            const maxMs = parseSchedule(maxRun) ?? Math.min(intervalMs, 600_000); // cap: schedule interval or 10 min
+            let timer;
+            await Promise.race([allDone, new Promise(r => {
+                    timer = setTimeout(r, maxMs);
+                    timer.unref?.();
+                })]);
+            if (timer)
+                clearTimeout(timer);
         }
-        if (sub === 'delete') {
-            const orgName = args[1];
-            if (!orgName) {
-                output.error('Usage: monomind org delete <name>');
-                return { success: false, message: 'org name required' };
-            }
-            if (!/^[a-z0-9][a-z0-9_-]*$/i.test(orgName)) {
-                output.error(`Invalid org name: ${orgName}`);
-                return { success: false, message: 'invalid org name' };
-            }
-            const confirmed = args.includes('--yes') || args.includes('-y');
-            if (!confirmed) {
-                output.warning(`This will permanently delete org "${orgName}" and all its data.`);
-                output.warning('Pass --yes to confirm.');
-                return { success: false, message: 'confirmation required' };
-            }
-            const cwd = resolve(context.cwd || process.cwd());
-            const orgsDir = join(cwd, '.monomind', 'orgs');
-            const configFile = join(orgsDir, `${orgName}.json`);
-            if (!existsSync(configFile)) {
-                output.error(`Org not found: ${orgName}`);
-                return { success: false, message: 'org not found' };
-            }
-            const suffixes = ['', '-state', '-goals', '-routines', '-approvals', '-activity',
-                '-issues', '-members', '-projects', '-workspaces', '-worktrees', '-environments',
-                '-plugins', '-adapters', '-budgets', '-threads', '-secrets', '-join-requests',
-                '-bootstrap', '-project-workspaces', '-approval-comments', '-skills'];
-            let removed = 0;
-            for (const suf of suffixes) {
-                for (const ext of ['.json', '.jsonl']) {
-                    const f = join(orgsDir, `${orgName}${suf}${ext}`);
-                    try {
-                        if (existsSync(f)) {
-                            unlinkSync(f);
-                            removed++;
-                        }
-                    }
-                    catch (_) { }
-                }
-            }
-            // Remove stop file
-            try {
-                unlinkSync(join(orgsDir, '.stops', `${orgName}.stop`));
-            }
-            catch (_) { }
-            // Remove org subdirectory
-            const orgSubDir = join(orgsDir, orgName);
-            try {
-                if (existsSync(orgSubDir))
-                    rmSync(orgSubDir, { recursive: true, force: true });
-            }
-            catch (_) { }
-            // Remove loop prompt file
+        catch (err) {
+            console.error(`org ${name}: scheduled run failed:`, err);
+        }
+        finally {
+            await daemon.stopOrg(name).catch(err => console.error(`org ${name}: stop failed:`, err));
+        }
+    });
+    const orgDir = join(ctx.cwd, ORG_DIR);
+    if (existsSync(orgDir)) {
+        for (const f of readdirSync(orgDir).filter(f => f.endsWith('.json'))) {
             try {
-                unlinkSync(join(cwd, '.monomind', 'loops', `${orgName}.md`));
+                const def = JSON.parse(readFileSync(join(orgDir, f), 'utf8'));
+                const ms = parseSchedule(def.schedule);
+                if (ms) {
+                    // register by filename stem — that's what startOrg loads
+                    const stem = f.replace(/\.json$/, '');
+                    if (def.name && def.name !== stem)
+                        log(output.warning(`org file ${f}: def.name "${def.name}" differs from filename — scheduling as "${stem}"`));
+                    sched.add(stem, ms);
+                    log(output.info(`scheduled org ${stem} every ${Math.round(ms / 60_000)}m`));
+                }
             }
-            catch (_) { }
-            // Remove run prompt file
+            catch { /* skip unparseable org file */ }
+        }
+    }
+    await new Promise(r => { process.once('SIGINT', () => r()); process.once('SIGTERM', () => r()); });
+    sched.stop();
+    await daemon.stopAll();
+    srv.close();
+    return { success: true };
+};
+const testLoopAction = async (ctx) => {
+    // non-literal specifier: test-loop.ts lands in a later task; keeps tsc clean until then
+    const testLoopModule = '../orgrt/test-loop.js';
+    const { runTestLoop } = await import(testLoopModule);
+    const n = Number(ctx.flags['times'] ?? ctx.flags['n'] ?? 5);
+    const report = await runTestLoop(ctx.cwd, n);
+    log(output.info(report.summary));
+    return { success: report.failed === 0, message: report.summary };
+};
+// ---- legacy management subcommands (list / delete / mark-complete) ----
+const listAction = async (ctx) => {
+    const orgsDir = join(ctx.cwd || process.cwd(), ORG_DIR);
+    if (!existsSync(orgsDir)) {
+        log(output.info('No orgs directory found. Create an org first with /mastermind:createorg'));
+        return { success: true };
+    }
+    const configs = listOrgConfigFiles(orgsDir);
+    if (!configs.length) {
+        log(output.info('No orgs found.'));
+        return { success: true };
+    }
+    log(output.info(`Found ${configs.length} org(s):`));
+    for (const f of configs)
+        log(output.info(`  • ${f.replace('.json', '')}`));
+    return { success: true };
+};
+const deleteAction = async (ctx) => {
+    const orgName = ctx.args[0];
+    if (!orgName) {
+        log(output.error('Usage: monomind org delete <name>'));
+        return { success: false, message: 'org name required' };
+    }
+    if (!/^[a-z0-9][a-z0-9_-]*$/i.test(orgName)) {
+        log(output.error(`Invalid org name: ${orgName}`));
+        return { success: false, message: 'invalid org name' };
+    }
+    const confirmed = ctx.flags['yes'] === true || ctx.args.includes('--yes') || ctx.args.includes('-y');
+    if (!confirmed) {
+        log(output.warning(`This will permanently delete org "${orgName}" and all its data.`));
+        log(output.warning('Pass --yes to confirm.'));
+        return { success: false, message: 'confirmation required' };
+    }
+    const cwd = resolve(ctx.cwd || process.cwd());
+    const orgsDir = join(cwd, ORG_DIR);
+    const configFile = join(orgsDir, `${orgName}.json`);
+    if (!existsSync(configFile)) {
+        log(output.error(`Org not found: ${orgName}`));
+        return { success: false, message: 'org not found' };
+    }
+    const suffixes = ['', '-state', '-goals', '-routines', '-approvals', '-activity',
+        '-issues', '-members', '-projects', '-workspaces', '-worktrees', '-environments',
+        '-plugins', '-adapters', '-budgets', '-threads', '-secrets', '-join-requests',
+        '-bootstrap', '-project-workspaces', '-approval-comments', '-skills'];
+    let removed = 0;
+    for (const suf of suffixes) {
+        for (const ext of ['.json', '.jsonl']) {
+            const f = join(orgsDir, `${orgName}${suf}${ext}`);
             try {
-                unlinkSync(join(cwd, '.monomind', 'orgs', `${orgName}-run.md`));
+                if (existsSync(f)) {
+                    unlinkSync(f);
+                    removed++;
+                }
             }
-            catch (_) { }
-            output.success(`Org "${orgName}" deleted (${removed} file(s) removed).`);
-            return { success: true };
+            catch { /* ignore */ }
         }
-        output.error(`Unknown subcommand: ${sub}. Run "monomind org help" for usage.`);
-        return { success: false, message: `unknown subcommand: ${sub}` };
-    },
+    }
+    try {
+        unlinkSync(join(orgsDir, '.stops', `${orgName}.stop`));
+    }
+    catch { /* ignore */ }
+    const orgSubDir = join(orgsDir, orgName);
+    try {
+        if (existsSync(orgSubDir))
+            rmSync(orgSubDir, { recursive: true, force: true });
+    }
+    catch { /* ignore */ }
+    try {
+        unlinkSync(join(cwd, '.monomind', 'loops', `${orgName}.md`));
+    }
+    catch { /* ignore */ }
+    try {
+        unlinkSync(join(orgsDir, `${orgName}-run.md`));
+    }
+    catch { /* ignore */ }
+    log(output.success(`Org "${orgName}" deleted (${removed} file(s) removed).`));
+    return { success: true };
+};
+const markCompleteAction = async (ctx) => {
+    const orgName = ctx.args[0];
+    if (!orgName || !/^[a-z0-9][a-z0-9_-]*$/i.test(orgName)) {
+        log(output.error('Usage: monomind org mark-complete <name>'));
+        return { success: false, message: 'valid org name required' };
+    }
+    const cwd = resolve(ctx.cwd || process.cwd());
+    let ctrlUrl = 'http://localhost:4242';
+    try {
+        const ctl = JSON.parse(readFileSync(join(cwd, '.monomind', 'control.json'), 'utf8'));
+        if (ctl.url)
+            ctrlUrl = ctl.url;
+    }
+    catch { /* default */ }
+    try {
+        const res = await fetch(`${ctrlUrl}/api/orgs/${encodeURIComponent(orgName)}/mark-complete`, { method: 'POST' });
+        const body = await res.json().catch(() => ({}));
+        if (!res.ok) {
+            log(output.error(`mark-complete failed (${res.status}): ${body.error || 'unknown error'}`));
+            return { success: false, message: 'server rejected mark-complete' };
+        }
+        const runId = body.runId;
+        log(output.success(`Run marked complete for org "${orgName}"${runId ? ` (run ${runId})` : ''}.`));
+        return { success: true };
+    }
+    catch (err) {
+        log(output.error(`Dashboard server unreachable at ${ctrlUrl} — is it running? (${err instanceof Error ? err.message : 'error'})`));
+        return { success: false, message: 'server unreachable' };
+    }
+};
+export const orgCommand = {
+    name: 'org',
+    description: 'SDK-based org runtime — run agent organizations as a controlled daemon',
+    subcommands: [
+        {
+            name: 'run', description: 'Start an org (foreground daemon)',
+            options: [
+                { name: 'task', description: 'Override the org goal for this run', type: 'string' },
+                { name: 'serve', description: 'Serve the live dashboard (default true)', type: 'boolean', default: true },
+                { name: 'port', description: 'Live dashboard port', type: 'number', default: 4243 },
+                { name: 'cross-process', description: 'Discover and message orgs hosted by other monomind processes on this machine (default true)', type: 'boolean', default: true },
+            ],
+            examples: [{ command: 'monomind org run growth --task "weekly report"', description: 'Run the growth org once with a task' }],
+            action: runAction,
+        },
+        { name: 'stop', description: 'Request a running org daemon to stop', action: stopAction },
+        { name: 'status', description: 'Show runtime state of orgs', action: statusAction },
+        {
+            name: 'serve', description: 'Start the daemon server only (hosts scheduled orgs)',
+            options: [
+                { name: 'port', description: 'Port', type: 'number', default: 4243 },
+                { name: 'cross-process', description: 'Discover and message orgs hosted by other monomind processes on this machine (default true)', type: 'boolean', default: true },
+            ],
+            action: serveAction,
+        },
+        {
+            name: 'test-loop', description: 'Run the org e2e verification loop N times',
+            options: [{ name: 'times', short: 'n', description: 'Iterations', type: 'number', default: 5 }],
+            action: testLoopAction,
+        },
+        { name: 'list', description: 'List all orgs in the current project', action: listAction },
+        {
+            name: 'delete', description: 'Delete an org and all its data',
+            options: [{ name: 'yes', short: 'y', description: 'Skip confirmation', type: 'boolean' }],
+            action: deleteAction,
+        },
+        { name: 'mark-complete', description: 'Manually close a stale/crashed run', action: markCompleteAction },
+    ],
+    examples: [{ command: 'monomind org run my-org', description: 'Run an org under full daemon control' }],
+    action: async () => ({ success: false, message: 'usage: monomind org <run|stop|status|serve|test-loop|list|delete|mark-complete>' }),
 };
 export default orgCommand;
 //# sourceMappingURL=org.js.map