@crewx/cli 0.8.3-rc.2 → 0.8.3-rc.4

package/dist/bootstrap/crewx-cli.js

@@ -1,18 +1,14 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createCliCrewx = createCliCrewx;
 const fs_1 = require("fs");
 const path_1 = require("path");
 const os_1 = require("os");
-const better_sqlite3_1 = __importDefault(require("better-sqlite3"));
 const sdk_1 = require("@crewx/sdk");
 const plugins_1 = require("@crewx/sdk/plugins");
+const repository_1 = require("@crewx/sdk/repository");
 const register_builtin_tools_1 = require("../register-builtin-tools");
 const version_1 = require("../utils/version");
-const tasks_1 = require("../schema/tasks");
 /**
  * Build a Crewx instance with CLI-standard plugins (FileLogger + SqliteTracing)
  * and built-in tools registered. Use this from any CLI command that needs a
@@ -38,22 +34,22 @@ async function createCliCrewx(configPath = process.env.CREWX_CONFIG ?? 'crewx.ya
         yamlPath = absConfigPath;
     }
     else if (isExplicitConfig) {
-        // Explicit config was set but file doesn't exist — throw
         throw new Error(`[crewx] Config file not found: ${absConfigPath} (set via CREWX_CONFIG)`);
     }
     else {
-        // No explicit config and file doesn't exist — built-in-only mode
         yamlPath = undefined;
     }
-    // Ensure ~/.crewx/crewx.db schema exists before SqliteTracingPlugin opens it.
+    // Run drizzle migrations once at bootstrap — plugin relies on this guarantee.
     const dbDir = (0, path_1.join)((0, os_1.homedir)(), '.crewx');
     (0, fs_1.mkdirSync)(dbDir, { recursive: true });
-    const schemaDb = new better_sqlite3_1.default((0, path_1.join)(dbDir, 'crewx.db'));
-    (0, tasks_1.ensureTasksSchema)(schemaDb);
-    schemaDb.close();
-    // Pass ourselves back to the SDK: when this Crewx encounters a file:// remote
-    // agent, the SDK uses this factory to bootstrap the target Crewx instance
-    // with the same plugin set (FileLogger + SqliteTracing + built-in tools).
+    const dbPath = (0, path_1.join)(dbDir, 'crewx.db');
+    const handle = (0, repository_1.openDrizzleDb)(dbPath);
+    try {
+        (0, repository_1.runMigrations)(handle.db);
+    }
+    finally {
+        handle.close();
+    }
     const crewx = await sdk_1.Crewx.loadYaml(yamlPath, {
         remoteFactory: createCliCrewx,
     });

package/dist/commands/init.d.ts

@@ -11,11 +11,15 @@ export interface InitResult {
     hookInstalled: boolean;
     errors: string[];
     skippedReason?: 'yaml-exists' | 'nested-project';
+    workspaceId?: string;
+    slug?: string;
 }
 /**
  * Programmatic init — creates crewx.yaml, support dirs, and optionally installs hooks.
  * Throws on unrecoverable errors (PATH_NOT_FOUND, NESTED_CREWX_PROJECT, YAML_CREATE_FAILED).
- * Partial failures (hook install, mkdir) are collected in InitResult.errors without rollback.
+ * Partial failures (hook install, mkdir, workspace registration) are collected in InitResult.errors.
+ * Workspace registration is always attempted (even when yaml already exists) so that CLI and
+ * server paths both produce a row in ~/.crewx/crewx.db.
  */
 export declare function handleInit(opts: {
     path: string;

package/dist/commands/init.js

@@ -11,6 +11,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleInit = handleInit;
 const fs_1 = require("fs");
 const path_1 = require("path");
+const repository_1 = require("@crewx/sdk/repository");
 const install_1 = require("./hook/install");
 const paths_1 = require("./hook/paths");
 const DEFAULT_AGENTS = [
@@ -82,13 +83,16 @@ ${agentBlocks}
 /**
  * Programmatic init — creates crewx.yaml, support dirs, and optionally installs hooks.
  * Throws on unrecoverable errors (PATH_NOT_FOUND, NESTED_CREWX_PROJECT, YAML_CREATE_FAILED).
- * Partial failures (hook install, mkdir) are collected in InitResult.errors without rollback.
+ * Partial failures (hook install, mkdir, workspace registration) are collected in InitResult.errors.
+ * Workspace registration is always attempted (even when yaml already exists) so that CLI and
+ * server paths both produce a row in ~/.crewx/crewx.db.
  */
 async function handleInit(opts) {
     const { path: target, skipHook = false, force = false } = opts;
     const errors = [];
     let yamlCreated = false;
     let hookInstalled = false;
+    let skippedReason;
     if (!(0, fs_1.existsSync)(target)) {
         throw new Error(`PATH_NOT_FOUND: ${target}`);
     }
@@ -101,33 +105,47 @@ async function handleInit(opts) {
     const ymlPath = (0, path_1.join)(target, 'crewx.yml');
     if ((0, fs_1.existsSync)(yamlPath) || (0, fs_1.existsSync)(ymlPath)) {
         if (!force) {
-            return { yamlCreated: false, hookInstalled: false, errors: [], skippedReason: 'yaml-exists' };
+            // yaml already exists: skip creation but still register workspace below
+            skippedReason = 'yaml-exists';
         }
     }
-    try {
-        const content = generateDefaultYaml(DEFAULT_AGENTS);
-        (0, fs_1.writeFileSync)(yamlPath, content, 'utf-8');
-        yamlCreated = true;
-    }
-    catch (e) {
-        throw new Error(`YAML_CREATE_FAILED: ${e.message}`);
-    }
-    for (const dir of ['.crewx/logs', '.claude/commands']) {
+    if (!skippedReason) {
         try {
-            (0, fs_1.mkdirSync)((0, path_1.join)(target, dir), { recursive: true });
+            const content = generateDefaultYaml(DEFAULT_AGENTS);
+            (0, fs_1.writeFileSync)(yamlPath, content, 'utf-8');
+            yamlCreated = true;
         }
         catch (e) {
-            errors.push(`MKDIR_FAILED:${dir}:${e.message}`);
+            throw new Error(`YAML_CREATE_FAILED: ${e.message}`);
         }
-    }
-    if (!skipHook) {
-        try {
-            await (0, install_1.handleHookInstall)({ projectRoot: target, yes: true });
-            hookInstalled = true;
+        for (const dir of ['.crewx/logs', '.claude/commands']) {
+            try {
+                (0, fs_1.mkdirSync)((0, path_1.join)(target, dir), { recursive: true });
+            }
+            catch (e) {
+                errors.push(`MKDIR_FAILED:${dir}:${e.message}`);
+            }
         }
-        catch (e) {
-            errors.push(`HOOK_INSTALL_FAILED: ${e.message}`);
+        if (!skipHook) {
+            try {
+                await (0, install_1.handleHookInstall)({ projectRoot: target, yes: true });
+                hookInstalled = true;
+            }
+            catch (e) {
+                errors.push(`HOOK_INSTALL_FAILED: ${e.message}`);
+            }
         }
     }
-    return { yamlCreated, hookInstalled, errors };
+    // Always register workspace in ~/.crewx/crewx.db (best-effort, idempotent)
+    let workspaceId;
+    let slug;
+    try {
+        const ws = new repository_1.WorkspaceRepository().registerWorkspace(target);
+        workspaceId = ws.id;
+        slug = ws.slug;
+    }
+    catch (e) {
+        errors.push(`WORKSPACE_REGISTER_FAILED: ${e.message}`);
+    }
+    return { yamlCreated, hookInstalled, errors, skippedReason, workspaceId, slug };
 }

package/dist/commands/kill.d.ts

@@ -6,7 +6,4 @@
  *   crewx kill <task-id>   Kill a specific running task
  *   crewx kill --all       Kill all running tasks
  */
-/**
- * Handle `crewx kill` command.
- */
 export declare function handleKill(args: string[]): Promise<void>;

package/dist/commands/kill.js

@@ -9,10 +9,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleKill = handleKill;
-const task_db_1 = require("./task-db");
-/**
- * Handle `crewx kill` command.
- */
+const repository_1 = require("@crewx/sdk/repository");
 async function handleKill(args) {
     const killAll = args.includes('--all');
     const taskId = args.find(a => !a.startsWith('--'));
@@ -25,25 +22,31 @@ async function handleKill(args) {
         process.exit(1);
         return;
     }
+    const repo = new repository_1.TaskRepository();
     if (killAll) {
-        const running = (0, task_db_1.getRunningTasks)();
+        const running = repo.getRunningTasks();
         if (running.length === 0) {
             console.log('No running tasks found.');
             return;
         }
         console.log(`Found ${running.length} running task(s). Killing...`);
         for (const task of running) {
-            const r = (0, task_db_1.killTask)(task.id);
-            console.log(r.message);
+            const r = repo.killTask(task.id);
+            if (r.killed) {
+                console.log(`Killed task ${task.id}${r.pid ? ` (PID: ${r.pid})` : ''}`);
+            }
+            else {
+                console.log(`Task ${task.id} could not be killed (may have already finished)`);
+            }
         }
         return;
     }
-    const r = (0, task_db_1.killTask)(taskId);
-    if (r.ok) {
-        console.log(r.message);
+    const r = repo.killTask(taskId);
+    if (r.killed) {
+        console.log(`Killed task ${taskId}${r.pid ? ` (PID: ${r.pid})` : ''}`);
     }
     else {
-        console.error(`Error: ${r.message}`);
+        console.error(`Error: Task not found or not running: ${taskId}`);
         process.exit(1);
     }
 }

package/dist/commands/log.d.ts

@@ -7,7 +7,4 @@
  *   crewx log ls           Same as above
  *   crewx log <task_id>    Show specific task details
  */
-/**
- * Handle `crewx log` command.
- */
 export declare function handleLog(args: string[]): Promise<void>;

package/dist/commands/log.js

@@ -10,24 +10,22 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleLog = handleLog;
-const task_db_1 = require("./task-db");
+const repository_1 = require("@crewx/sdk/repository");
 function statusIcon(status) {
     switch (status) {
         case 'running': return '⏳';
         case 'success': return '✅';
         case 'failed': return '❌';
+        default: return '❓';
     }
 }
-/**
- * Handle `crewx log` command.
- */
 async function handleLog(args) {
     const action = args[0];
     const isTaskId = action && (action.startsWith('tsk_') || action.startsWith('task_'));
     const isListCommand = !action || action === 'ls' || action === 'list';
+    const repo = new repository_1.TaskRepository();
     if (isTaskId) {
-        // Show specific task
-        const task = (0, task_db_1.getTask)(action);
+        const task = repo.getTask(action);
         if (!task) {
             console.error(`Task not found: ${action}`);
             process.exit(1);
@@ -36,8 +34,8 @@ async function handleLog(args) {
         console.log(`\nTask Log\n${'='.repeat(60)}`);
         console.log(`Task ID: ${task.id}`);
         console.log(`Status: ${statusIcon(task.status)} ${task.status}`);
-        console.log(`Agent: ${task.agent_id}`);
-        console.log(`Mode: ${task.mode}`);
+        console.log(`Agent: ${task.agent_id ?? '—'}`);
+        console.log(`Mode: ${task.mode ?? '—'}`);
         console.log(`Started: ${new Date(task.started_at).toLocaleString()}`);
         if (task.completed_at) {
             const duration = new Date(task.completed_at).getTime() - new Date(task.started_at).getTime();
@@ -58,13 +56,13 @@ async function handleLog(args) {
         return;
     }
     if (isListCommand) {
-        const allTasks = (0, task_db_1.getAllTasks)();
+        const allTasks = repo.getAllTasks();
         console.log('\nAvailable Task Logs');
         console.log('='.repeat(60));
         const total = allTasks.length;
-        const completed = allTasks.filter(t => t.status === 'success').length;
-        const failed = allTasks.filter(t => t.status === 'failed').length;
-        const running = allTasks.filter(t => t.status === 'running').length;
+        const completed = allTasks.filter((t) => t.status === 'success').length;
+        const failed = allTasks.filter((t) => t.status === 'failed').length;
+        const running = allTasks.filter((t) => t.status === 'running').length;
         console.log(`Total: ${total} | ✅ Completed: ${completed} | ❌ Failed: ${failed} | ⏳ Running: ${running}`);
         console.log('='.repeat(60));
         console.log('');
@@ -79,7 +77,7 @@ async function handleLog(args) {
                 ? `${new Date(task.completed_at).getTime() - new Date(task.started_at).getTime()}ms`
                 : 'running...';
             console.log(`${idx + 1}. ${icon} ${task.id}`);
-            console.log(`   Agent: ${task.agent_id}  Mode: ${task.mode}`);
+            console.log(`   Agent: ${task.agent_id ?? '—'}  Mode: ${task.mode ?? '—'}`);
             console.log(`   Started: ${new Date(task.started_at).toLocaleString()}`);
             console.log(`   Duration: ${duration}`);
             console.log('');

package/dist/commands/ps.d.ts

@@ -6,7 +6,4 @@
  *   crewx ps           List all running tasks
  *   crewx ps --json    Output as JSON array
  */
-/**
- * Handle `crewx ps` command.
- */
 export declare function handlePs(args: string[]): Promise<void>;

package/dist/commands/ps.js

@@ -9,10 +9,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handlePs = handlePs;
-const task_db_1 = require("./task-db");
-/**
- * Format elapsed milliseconds into a human-readable string.
- */
+const repository_1 = require("@crewx/sdk/repository");
 function formatElapsed(ms) {
     const s = Math.floor(ms / 1000);
     if (s < 60)
@@ -24,22 +21,16 @@ function formatElapsed(ms) {
     const h = Math.floor(m / 60);
     return `${h}h ${m % 60}m`;
 }
-/**
- * Format a task row into a table row.
- */
 function taskToRow(task) {
     const elapsed = formatElapsed(Date.now() - new Date(task.started_at).getTime());
     return [
         task.id,
-        task.agent_id,
-        task.pid !== null ? String(task.pid) : '—',
+        task.agent_id ?? '—',
+        task.pid !== null && task.pid !== undefined ? String(task.pid) : '—',
         elapsed,
-        task.mode,
+        task.mode ?? '—',
     ];
 }
-/**
- * Render a table with padded columns.
- */
 function renderTable(headers, rows) {
     const colWidths = headers.map((h, i) => Math.max(h.length, ...rows.map(r => (r[i] ?? '').length)));
     const separator = colWidths.map(w => '-'.repeat(w)).join('  ');
@@ -50,16 +41,13 @@ function renderTable(headers, rows) {
         console.log(row.map((cell, i) => cell.padEnd(colWidths[i] ?? cell.length)).join('  '));
     }
 }
-/**
- * Handle `crewx ps` command.
- */
 async function handlePs(args) {
-    const tasks = (0, task_db_1.getRunningTasks)();
+    const repo = new repository_1.TaskRepository();
+    const tasks = repo.getRunningTasks();
     if (tasks.length === 0) {
         console.log('No running tasks.');
         return;
     }
-    // --json output
     if (args.includes('--json')) {
         console.log(JSON.stringify(tasks, null, 2));
         return;

package/dist/commands/result.d.ts

@@ -7,7 +7,4 @@
  *   crewx result <task-id> --json  Print full task record as JSON
  *   crewx result                   List recent tasks (latest 10)
  */
-/**
- * Handle `crewx result` command.
- */
 export declare function handleResult(args: string[]): Promise<void>;

package/dist/commands/result.js

@@ -10,23 +10,21 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleResult = handleResult;
-const task_db_1 = require("./task-db");
+const repository_1 = require("@crewx/sdk/repository");
 function statusIcon(status) {
     switch (status) {
         case 'running': return '⏳';
         case 'success': return '✅';
         case 'failed': return '❌';
+        default: return '❓';
     }
 }
-/**
- * Handle `crewx result` command.
- */
 async function handleResult(args) {
     const jsonMode = args.includes('--json');
     const taskId = args.find(a => !a.startsWith('--'));
+    const repo = new repository_1.TaskRepository();
     if (!taskId) {
-        // Show recent tasks
-        const all = (0, task_db_1.getAllTasks)();
+        const all = repo.getAllTasks();
         const recent = all.slice(0, 10);
         if (recent.length === 0) {
             console.log('No tasks found.');
@@ -37,7 +35,7 @@ async function handleResult(args) {
         recent.forEach((task, idx) => {
             const icon = statusIcon(task.status);
             console.log(`${idx + 1}. ${icon} ${task.id}`);
-            console.log(`   Agent: ${task.agent_id}  Mode: ${task.mode}`);
+            console.log(`   Agent: ${task.agent_id ?? '—'}  Mode: ${task.mode ?? '—'}`);
             console.log(`   Started: ${new Date(task.started_at).toLocaleString()}`);
             if (task.completed_at) {
                 console.log(`   Completed: ${new Date(task.completed_at).toLocaleString()}`);
@@ -47,7 +45,7 @@ async function handleResult(args) {
         console.log('Tip: Run `crewx result <task-id>` to see full output.');
         return;
     }
-    const task = (0, task_db_1.getTask)(taskId);
+    const task = repo.getTask(taskId);
     if (!task) {
         console.error(`Error: Task not found: ${taskId}`);
         process.exit(1);
@@ -68,6 +66,5 @@ async function handleResult(args) {
         process.exit(1);
         return;
     }
-    // Completed (success) — print raw result
     console.log(task.result ?? '');
 }

package/dist/main.js

@@ -58,7 +58,6 @@ const result_1 = require("./commands/result");
 const log_1 = require("./commands/log");
 const doctor_1 = require("./commands/doctor");
 const init_1 = require("./commands/init");
-const workspace_repository_1 = require("./repository/workspace.repository");
 const builtin_1 = require("./builtin");
 const slack_1 = require("./commands/slack");
 const install_1 = require("./commands/hook/install");
@@ -146,7 +145,6 @@ async function main() {
             const force = initArgs.includes('--force') || initArgs.includes('-f');
             try {
                 const r = await (0, init_1.handleInit)({ path: process.cwd(), force });
-                new workspace_repository_1.WorkspaceRepository().registerWorkspace(process.cwd());
                 if (r.skippedReason === 'yaml-exists') {
                     console.log('✓ crewx.yaml already exists (use --force to overwrite)');
                 }
@@ -156,6 +154,8 @@ async function main() {
                     if (r.errors.length > 0)
                         console.warn('Warnings:', r.errors.join('; '));
                 }
+                if (r.workspaceId)
+                    console.log(`✓ workspace registered (id=${r.workspaceId}, slug=${r.slug})`);
                 console.log('✓ done');
             }
             catch (e) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crewx/cli",
-  "version": "0.8.3-rc.2",
+  "version": "0.8.3-rc.4",
   "license": "UNLICENSED",
   "engines": {
     "node": ">=20.19.0"
@@ -27,14 +27,14 @@
   "dependencies": {
     "@crewx/adapter-slack": "^0.1.4",
     "better-sqlite3": "*",
-    "@crewx/sdk": "0.8.2",
+    "@crewx/sdk": "0.8.3-rc.1",
     "@crewx/memory": "0.1.9",
     "@crewx/search": "0.1.8",
-    "@crewx/doc": "0.1.7",
     "@crewx/wbs": "0.1.8",
+    "@crewx/doc": "0.1.7",
     "@crewx/skill": "0.1.7",
-    "@crewx/workflow": "0.3.13",
     "@crewx/cron": "0.1.7",
+    "@crewx/workflow": "0.3.13",
     "@crewx/shared": "0.0.4"
   },
   "devDependencies": {