@oml/cli 0.14.15 → 0.14.17

package/src/commands/server/actions.ts

@@ -34,7 +34,7 @@ type ServerStatePaths = {
 type ServerLockState = {
     pid: number;
     port: number;
-    owner?: 'daemon' | 'extension';
+    owner?: 'cli' | 'extension';
     workspaceRoot?: string;
 };
 
@@ -78,7 +78,7 @@ function parseServerLock(raw: string): ServerLockState | undefined {
         if (pidInt <= 0 || portInt <= 0 || portInt > 65535) {
             return undefined;
         }
-        const owner = parsed.owner === 'daemon' || parsed.owner === 'extension'
+        const owner = parsed.owner === 'cli' || parsed.owner === 'extension'
             ? parsed.owner
             : undefined;
         const workspaceRoot = typeof parsed.workspaceRoot === 'string' && parsed.workspaceRoot.trim().length > 0
@@ -105,7 +105,7 @@ async function readServerLock(lockFile: string): Promise<ServerLockState | undef
 type RunningServer = {
     pid: number;
     port: number;
-    owner: 'daemon' | 'extension' | 'unknown';
+    owner: 'cli' | 'extension' | 'unknown';
     workspaceRoot?: string;
     lockFile: string;
 };
@@ -257,7 +257,7 @@ function normalizeStartPort(value: number | string | undefined): number {
     return intPort;
 }
 
-async function inspectListeningProcess(port: number): Promise<string> {
+async function inspectListeningProcess(port: number): Promise<string | undefined> {
     const args = ['-nP', `-iTCP:${port}`, '-sTCP:LISTEN'];
     try {
         const { stdout } = await execFileAsync('lsof', args);
@@ -265,7 +265,7 @@ async function inspectListeningProcess(port: number): Promise<string> {
     } catch (error) {
         const failed = error as NodeJS.ErrnoException & { stdout?: string };
         if (failed?.code === 'ENOENT') {
-            throw new Error("Cannot inspect ports because 'lsof' is not installed or not on PATH.");
+            return undefined;
         }
         return typeof failed?.stdout === 'string' ? failed.stdout.trim() : '';
     }
@@ -392,7 +392,7 @@ export async function serverStopAction(): Promise<void> {
         return;
     }
     const owner = state.owner ?? 'unknown';
-    if (owner !== 'daemon') {
+    if (owner !== 'cli') {
         process.stdout.write(`Server is running (pid ${state.pid}, port ${state.port}) and managed by ${owner}; not stopping.\n`);
         return;
     }
@@ -417,6 +417,11 @@ export async function serverStatusAction(): Promise<void> {
         return;
     }
     const output = await inspectListeningProcess(state.port);
+    if (output === undefined) {
+        const owner = state.owner ?? 'unknown';
+        process.stdout.write(`Server is running on http://${DEFAULT_HOST}:${state.port} (pid ${state.pid}, owner ${owner}).\n`);
+        return;
+    }
     if (!output) {
         process.stdout.write(`No listening process found on port ${state.port}.\n`);
         return;

package/src/commands/validate.ts

@@ -3,6 +3,7 @@
 import chalk from 'chalk';
 import { failCli } from '../cli-error.js';
 import { formatDuration } from '../util.js';
+import { printLintDiagnostics, type LintProblem } from './lint.js';
 import { restPost } from './server/rest.js';
 
 export type ValidateOptions = {
@@ -16,25 +17,76 @@ export const validateAction = async (opts: ValidateOptions): Promise<void> => {
         filesChecked: number;
         errors: number;
         warnings: number;
+        failingItems?: number;
+        details?: string[];
+        validationProblems?: Array<{
+            modelUri: string;
+            element: string;
+            property: string;
+            message: string;
+        }>;
         elapsedMs?: number;
+        problems?: LintProblem[];
         error?: string;
     }>('/v0/validate', {}, opts.authToken);
 
-    if (!result.success) {
-        failCli(chalk.red(result.error?.trim() || 'validate failed.'));
-    }
     if (result.filesChecked === 0) {
         console.log(chalk.yellow('No markdown/table-editor targets found in server workspace.'));
         return;
     }
+    printLintDiagnostics({
+        success: false,
+        filesChecked: result.filesChecked,
+        errors: result.errors,
+        warnings: result.warnings,
+        elapsedMs: result.elapsedMs,
+        problems: result.problems,
+    });
+    const validationProblems = Array.isArray(result.validationProblems) ? result.validationProblems : [];
+    if (validationProblems.length > 0) {
+        const groups = new Map<string, Array<{ element: string; property: string; message: string }>>();
+        for (const problem of validationProblems) {
+            const key = String(problem.modelUri ?? '').trim() || '<unknown>';
+            const existing = groups.get(key) ?? [];
+            existing.push({
+                element: String(problem.element ?? '-'),
+                property: String(problem.property ?? '-'),
+                message: String(problem.message ?? ''),
+            });
+            groups.set(key, existing);
+        }
+        for (const [modelUri, issues] of groups.entries()) {
+            console.log(chalk.red(`Model: ${modelUri}`));
+            for (const issue of issues) {
+                console.log(chalk.red(`  element: ${issue.element}`));
+                console.log(chalk.red(`  property: ${issue.property}`));
+                console.log(chalk.red(`  message: ${issue.message}`));
+            }
+        }
+    } else {
+        const details = Array.isArray(result.details) ? result.details : [];
+        for (const detail of details) {
+            if (String(detail).trim().length > 0) {
+                console.log(chalk.red(String(detail)));
+            }
+        }
+    }
     const validateElapsedMs = typeof result.elapsedMs === 'number' && Number.isFinite(result.elapsedMs) && result.elapsedMs >= 0
         ? result.elapsedMs
         : Date.now() - startedAt;
     if (result.errors > 0) {
+        const failingItems = Number(result.failingItems ?? 0);
+        if (failingItems > 0) {
+            failCli(chalk.red(`validate: ${result.filesChecked} table-editor block(s) scanned [${formatDuration(validateElapsedMs)}]; ${failingItems} failing block(s), ${result.errors} error(s), ${result.warnings} warning(s)`));
+        }
         failCli(chalk.red(`validate: ${result.filesChecked} item(s) checked with ${result.errors} error(s) and ${result.warnings} warning(s). [${formatDuration(validateElapsedMs)}]`));
     }
     if (result.warnings > 0) {
+        const failingItems = Number(result.failingItems ?? 0);
+        if (failingItems > 0) {
+            failCli(chalk.yellow(`validate: ${result.filesChecked} table-editor block(s) scanned [${formatDuration(validateElapsedMs)}]; ${failingItems} failing block(s), ${result.errors} error(s), ${result.warnings} warning(s)`));
+        }
         failCli(chalk.yellow(`validate: ${result.filesChecked} item(s) checked with ${result.warnings} warning(s). [${formatDuration(validateElapsedMs)}]`));
     }
-    console.log(chalk.green(`validate: ${result.filesChecked} item(s) checked. [${formatDuration(validateElapsedMs)}]`));
+    console.log(chalk.green(`validate: ${result.filesChecked} table-editor block(s) scanned [${formatDuration(validateElapsedMs)}]`));
 };