@procedures/mark 0.33.0 → 0.35.0

package/src/client-mode.ts

@@ -61,7 +61,7 @@ export async function cliServerConnection(
   try {
     // Dynamic import client
     const clientModule = await import("@procedures/client");
-    const { Client, HttpTransport } = clientModule;
+    const { Client, HttpTransport, pathToMethod } = clientModule;
 
     // Connect to server
     const transport = new HttpTransport({
@@ -72,8 +72,8 @@ export async function cliServerConnection(
 
     // The method of the path as ProcedureServer registers it: the last segment is the operation.
     // (Before, the first segment was the service, so a path of three segments - docker compose up -
-    // was not found on the server.)
-    method = { service: path.slice(0, -1).join("."), operation: path[path.length - 1]! };
+    // was not found on the server.) The core mapping encodes a dot in a segment (roadmap CLI-75).
+    method = pathToMethod(path);
   } catch {
     // Nothing was sent to the server yet - fall back to local execution
     return null;

package/src/failure.ts

@@ -10,38 +10,8 @@
  *    runs an external command (`vitest run`, `shell run`), so the caller sees the command's result.
  *
  * For a streaming procedure, each item is examined: one failed item makes the command fail.
+ *
+ * The code is in `@procedures/cli-kit` (roadmap O61).
  */
 
-/** A short description of the failure that a result reports, or undefined when it reports none */
-export function failureOf(result: unknown): string | undefined {
-  if (!result || typeof result !== "object" || Array.isArray(result)) {
-    return undefined;
-  }
-  const record = result as Record<string, unknown>;
-  const exitCode = record["exitCode"];
-  if (typeof exitCode === "number" && exitCode !== 0) {
-    return `exit code ${exitCode}`;
-  }
-  if (record["success"] === false) {
-    return firstText(record["error"]) ?? firstText(record["errors"]) ?? firstText(record["message"]) ?? "success: false";
-  }
-  return undefined;
-}
-
-/** The first text of a value: a string, the message of an error object, or the first of a list */
-function firstText(value: unknown): string | undefined {
-  if (typeof value === "string" && value.length > 0) {
-    return value;
-  }
-  if (Array.isArray(value)) {
-    for (const item of value) {
-      const text = firstText(item);
-      if (text) return text;
-    }
-    return undefined;
-  }
-  if (value && typeof value === "object" && typeof (value as { message?: unknown }).message === "string") {
-    return (value as { message: string }).message;
-  }
-  return undefined;
-}
+export { failureOf } from "@procedures/cli-kit";

package/src/format.ts

@@ -1,177 +1,8 @@
 /**
  * Output Formatting
  *
- * Formats procedure results for CLI output based on metadata hints.
+ * Formats procedure results for CLI output based on metadata hints. The code is in
+ * `@procedures/cli-kit` (roadmap O61).
  */
 
-export type OutputFormat = "text" | "json" | "table" | "streaming";
-
-/**
- * Print interface (used by formatOutput)
- */
-export interface Print {
-  info: (message: string) => void;
-  error: (message: string) => void;
-  success: (message: string) => void;
-  warning: (message: string) => void;
-  table: (data: string[][], options?: { format?: string }) => void;
-  spin: (message: string) => Spinner;
-}
-
-export interface Spinner {
-  stop: () => void;
-  succeed: (message?: string) => void;
-  fail: (message?: string) => void;
-  text: string;
-}
-
-/**
- * Format and print the result based on output format hint
- */
-export function formatOutput(
-  print: Print,
-  result: unknown,
-  format: OutputFormat = "text"
-): void {
-  if (result === undefined || result === null) {
-    return;
-  }
-
-  switch (format) {
-    case "json":
-      print.info(JSON.stringify(result, null, 2));
-      break;
-
-    case "table":
-      formatTable(print, result);
-      break;
-
-    case "text":
-    case "streaming":
-    default:
-      formatText(print, result);
-      break;
-  }
-}
-
-/**
- * Format as text - handles common result shapes
- */
-function formatText(print: Print, result: unknown): void {
-  // String output
-  if (typeof result === "string") {
-    print.info(result);
-    return;
-  }
-
-  // Result with output field (common pattern)
-  if (isObjectWithOutput(result)) {
-    print.info(result.output);
-    return;
-  }
-
-  // Result with message field
-  if (isObjectWithMessage(result)) {
-    if (result.success === false) {
-      print.error(result.message);
-    } else {
-      print.success(result.message);
-    }
-    return;
-  }
-
-  // Result with error field
-  if (isObjectWithError(result)) {
-    print.error(result.error);
-    return;
-  }
-
-  // Array of items
-  if (Array.isArray(result)) {
-    for (const item of result) {
-      formatText(print, item);
-    }
-    return;
-  }
-
-  // Fallback to JSON
-  print.info(JSON.stringify(result, null, 2));
-}
-
-/**
- * Format as table - handles arrays of objects
- */
-function formatTable(print: Print, result: unknown): void {
-  // Result with rows/headers
-  if (isTableResult(result)) {
-    const headers = result.headers ?? Object.keys(result.rows[0] ?? {});
-    const data: string[][] = [headers];
-
-    for (const row of result.rows) {
-      if (Array.isArray(row)) {
-        data.push(row.map(String));
-      } else if (typeof row === "object" && row !== null) {
-        data.push(headers.map((h) => String((row as Record<string, unknown>)[h] ?? "")));
-      }
-    }
-
-    print.table(data);
-    return;
-  }
-
-  // Plain array of objects
-  if (Array.isArray(result) && result.length > 0 && typeof result[0] === "object") {
-    const headers = Object.keys(result[0] as object);
-    const data: string[][] = [headers];
-
-    for (const row of result) {
-      if (typeof row === "object" && row !== null) {
-        data.push(headers.map((h) => String((row as Record<string, unknown>)[h] ?? "")));
-      }
-    }
-
-    print.table(data);
-    return;
-  }
-
-  // Fallback to text
-  formatText(print, result);
-}
-
-// Type guards
-
-function isObjectWithOutput(val: unknown): val is { output: string } {
-  return (
-    typeof val === "object" &&
-    val !== null &&
-    "output" in val &&
-    typeof (val as { output: unknown }).output === "string"
-  );
-}
-
-function isObjectWithMessage(val: unknown): val is { message: string; success?: boolean } {
-  return (
-    typeof val === "object" &&
-    val !== null &&
-    "message" in val &&
-    typeof (val as { message: unknown }).message === "string"
-  );
-}
-
-function isObjectWithError(val: unknown): val is { error: string } {
-  return (
-    typeof val === "object" &&
-    val !== null &&
-    "error" in val &&
-    typeof (val as { error: unknown }).error === "string"
-  );
-}
-
-function isTableResult(val: unknown): val is { rows: unknown[]; headers?: string[] } {
-  return (
-    typeof val === "object" &&
-    val !== null &&
-    "rows" in val &&
-    Array.isArray((val as { rows: unknown }).rows)
-  );
-}
+export { formatOutput, type OutputFormat, type Print, type Spinner } from "@procedures/cli-kit";

package/src/manifest.ts

@@ -18,6 +18,7 @@ import * as fs from "node:fs";
 import * as path from "node:path";
 import { fileURLToPath } from "node:url";
 import { describeProcedureEntry, jsonSchemaOf, type AnyProcedure, type ProcedureEntry } from "@procedures/client";
+import { writeFileAtomicSync } from "@procedures/fs/files";
 import { discoverFromEcosystem, findWorkspaceRoot } from "./ecosystem.js";
 import { extractSchemaFields, resultFieldsOfSchema, type CLIMeta, type SchemaFieldInfo } from "./parse.js";
 
@@ -140,14 +141,8 @@ export async function writeManifest(procedures: readonly AnyProcedure[], file: s
     generatedAt: new Date().toISOString(),
     commands: await commandsOf(procedures),
   };
-  const temporary = `${file}.${process.pid}.tmp`;
-  fs.writeFileSync(temporary, toJson(manifest));
-  try {
-    fs.renameSync(temporary, file);
-  } catch (error) {
-    fs.rmSync(temporary, { force: true });
-    throw error;
-  }
+  // writeFileAtomicSync flushes the file, tries the rename again on Windows and removes the temporary file after a failure
+  writeFileAtomicSync(file, toJson(manifest));
   return manifest;
 }