@procedures/mark 0.7.0 → 0.8.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package",
   "name": "@procedures/mark",
-  "version": "0.7.0",
+  "version": "0.8.1",
   "description": "mark: one CLI for every procedure package. It finds the procedures, parses flags by their Zod types, runs local or through a fast warm server, and asks for missing arguments.",
   "keywords": [
     "cli",
@@ -52,16 +52,16 @@
   },
   "dependencies": {
     "@clack/prompts": "^0.7.0",
-    "@procedures/cli-run": "0.7.0",
-    "@procedures/client": "0.7.0",
-    "@procedures/lib": "0.7.0",
-    "@procedures/mcp-dev-tools": "0.7.0",
-    "@procedures/peer": "0.7.0",
-    "@procedures/pnpm": "0.7.0",
-    "@procedures/procedure": "0.7.0",
-    "@procedures/server": "0.7.0",
-    "@procedures/shell": "0.7.0",
-    "@procedures/vitest": "0.7.0",
+    "@procedures/cli-run": "0.8.1",
+    "@procedures/client": "0.8.1",
+    "@procedures/lib": "0.8.1",
+    "@procedures/mcp-dev-tools": "0.8.1",
+    "@procedures/peer": "0.8.1",
+    "@procedures/pnpm": "0.8.1",
+    "@procedures/procedure": "0.8.1",
+    "@procedures/server": "0.8.1",
+    "@procedures/shell": "0.8.1",
+    "@procedures/vitest": "0.8.1",
     "chalk": "^5.3.0",
     "cli-table3": "^0.6.5",
     "ora": "^8.0.0",
@@ -70,44 +70,44 @@
   },
   "devDependencies": {
     "@mark1russell7/cue": "^1.0.0",
-    "@procedures/archive": "0.7.0",
-    "@procedures/bundle-assistant": "0.7.0",
-    "@procedures/bundle-dev": "0.7.0",
-    "@procedures/bundle-mcp": "0.7.0",
-    "@procedures/claude-cli": "0.7.0",
-    "@procedures/compiler": "0.7.0",
-    "@procedures/cue": "0.7.0",
-    "@procedures/dag": "0.7.0",
-    "@procedures/docker": "0.7.0",
-    "@procedures/env": "0.7.0",
-    "@procedures/exif": "0.7.0",
-    "@procedures/fs": "0.7.0",
-    "@procedures/geo": "0.7.0",
-    "@procedures/gh": "0.7.0",
-    "@procedures/git": "0.7.0",
-    "@procedures/http": "0.7.0",
-    "@procedures/ics": "0.7.0",
-    "@procedures/ios-backup": "0.7.0",
-    "@procedures/json": "0.7.0",
-    "@procedures/llm": "0.7.0",
-    "@procedures/mail": "0.7.0",
-    "@procedures/mongo": "0.7.0",
-    "@procedures/node": "0.7.0",
-    "@procedures/notify": "0.7.0",
-    "@procedures/npm": "0.7.0",
-    "@procedures/pdf": "0.7.0",
-    "@procedures/privacy-scan": "0.7.0",
-    "@procedures/restic": "0.7.0",
-    "@procedures/s3": "0.7.0",
-    "@procedures/schedule": "0.7.0",
-    "@procedures/snapshot": "0.7.0",
-    "@procedures/splay": "0.7.0",
-    "@procedures/sqlite": "0.7.0",
-    "@procedures/store": "0.7.0",
-    "@procedures/systems": "0.7.0",
-    "@procedures/tailscale": "0.7.0",
-    "@procedures/vite": "0.7.0",
-    "@procedures/weather": "0.7.0",
+    "@procedures/archive": "0.8.1",
+    "@procedures/bundle-assistant": "0.8.1",
+    "@procedures/bundle-dev": "0.8.1",
+    "@procedures/bundle-mcp": "0.8.1",
+    "@procedures/claude-cli": "0.8.1",
+    "@procedures/compiler": "0.8.1",
+    "@procedures/cue": "0.8.1",
+    "@procedures/dag": "0.8.1",
+    "@procedures/docker": "0.8.1",
+    "@procedures/env": "0.8.1",
+    "@procedures/exif": "0.8.1",
+    "@procedures/fs": "0.8.1",
+    "@procedures/geo": "0.8.1",
+    "@procedures/gh": "0.8.1",
+    "@procedures/git": "0.8.1",
+    "@procedures/http": "0.8.1",
+    "@procedures/ics": "0.8.1",
+    "@procedures/ios-backup": "0.8.1",
+    "@procedures/json": "0.8.1",
+    "@procedures/llm": "0.8.1",
+    "@procedures/mail": "0.8.1",
+    "@procedures/mongo": "0.8.1",
+    "@procedures/node": "0.8.1",
+    "@procedures/notify": "0.8.1",
+    "@procedures/npm": "0.8.1",
+    "@procedures/pdf": "0.8.1",
+    "@procedures/privacy-scan": "0.8.1",
+    "@procedures/restic": "0.8.1",
+    "@procedures/s3": "0.8.1",
+    "@procedures/schedule": "0.8.1",
+    "@procedures/snapshot": "0.8.1",
+    "@procedures/splay": "0.8.1",
+    "@procedures/sqlite": "0.8.1",
+    "@procedures/store": "0.8.1",
+    "@procedures/systems": "0.8.1",
+    "@procedures/tailscale": "0.8.1",
+    "@procedures/vite": "0.8.1",
+    "@procedures/weather": "0.8.1",
     "@types/node": "^22.0.0",
     "fast-check": "^4.10.2",
     "typescript": "^7.0.2",

package/src/args.ts

@@ -413,7 +413,9 @@ export function parseCommandLine<T extends CommandLike>(argv: readonly string[],
         return;
       }
       let value: unknown;
-      if (many && texts.length > 1) {
+      // Each argument of a last array field is one item, also when there is only one. Before, one
+      // argument was converted as the whole array, so `[]` gave no item and `["a","b"]` two.
+      if (many) {
         const items: unknown[] = [];
         for (const text of texts) {
           const converted = convertValue(text, type.item ?? ANY, field);

package/src/cli.ts

@@ -142,7 +142,8 @@ function showRootHelp(procedures: readonly CommandLike[]): void {
   print.info("Hosts: 'mark serve [--procedures pkgs] [--port N] [--expose patterns] [--events topics]' (the procedure server),");
   print.info("       'mark mcp' (the dev-tools MCP server over stdio).");
   print.info("Modes: 'mark --server [--port N] [--host H] [--transport http|websocket|both] [--events topics]' and 'mark -i' (the REPL).");
-  print.info("Root:  'mark --fs-root <folder> <command>' confines each path of fs.* to the folder, also in each mode and host.");
+  print.info("Root:  'mark --fs-root <folder> <command>' keeps each path of each procedure in the folder, also in each mode and host.");
+  print.info("       It refuses the procedures that it cannot confine: git, pnpm, docker run, a program (FORBIDDEN, outside-root).");
 }
 
 /** The global flags that only `--server` takes. */
@@ -207,7 +208,7 @@ function interruptSignal(): { signal: AbortSignal; release: () => void } {
 /**
  * Initialize the CLI context (load ecosystem, create client)
  * This is the expensive part (~4s). Call once, reuse many times. With `fsRoot` (`--fs-root`),
- * the `fs.*` procedures confine each path to the root, also in the nested calls.
+ * each procedure keeps its paths in the root, also in the nested calls, or the root refuses it.
  */
 export async function initCli(verbose = false, fsRoot?: string): Promise<CliContext> {
   const clientModule = await import("@procedures/client");
@@ -485,8 +486,9 @@ Options:
   --http <port>         Serve over Streamable HTTP on this port, not over stdio (MCP_HTTP_PORT)
   --host <host>         The address of --http (default: 127.0.0.1, only this computer)
   --token <token>       A secret that each HTTP request must send as a bearer token
-  --fs-root <folder>    Confine each path of fs.* to this folder, also the nested fs calls
-                        of the tools (default: MCP_FS_ROOT, or no root). The tools stay the same.
+  --fs-root <folder>    Keep each path of each tool in this folder, also in the nested calls,
+                        and refuse each tool that the folder cannot confine (default:
+                        MCP_FS_ROOT, or no root). The list of the tools stays the same.
   --debug               Write debug lines to stderr
   -h, --help            Show this help
 

package/src/ecosystem.ts

@@ -209,36 +209,43 @@ const allCoreModule: ProcedureModule = defineModule("@procedures/client (all cor
 export interface EcosystemRegistry {
   registry: ProcedureRegistry;
   loaded: string[];
-  /** The absolute path of the root of the `fs.*` procedures (`--fs-root`), or undefined. */
+  /** The absolute path of the root of the files (`--fs-root`), or undefined. */
   fsRoot?: string | undefined;
+  /** The keys of the procedures that the root refuses, or undefined without a root. */
+  refusedUnderRoot?: string[] | undefined;
 }
 
 /** The options of `loadEcosystemRegistry()`. */
 export interface EcosystemOptions {
   /**
-   * The folder that confines each path of the `fs.*` procedures (`--fs-root`, roadmap R33). The
-   * nested `fs.*` calls of the other procedures are confined too.
+   * The root of the files (`--fs-root`, roadmap R33). Each procedure keeps its paths in the root,
+   * also in the nested calls, or the root refuses it (`confineToRoot()` of `@procedures/fs`).
    */
   fsRoot?: string | undefined;
 }
 
-/** The function of `@procedures/fs` that confines the `fs.*` procedures of a registry to a root. */
-type ConfineFs = (registry: ProcedureRegistry, root: string) => { root: string; procedures: string[] };
+/** The function of `@procedures/fs` that confines each procedure of a registry to a root. */
+type ConfineToRoot = (registry: ProcedureRegistry, root: string) => { root: string; refused: string[] };
 
 /**
- * This function confines the `fs.*` procedures of the registry to a root, with
- * `confineFsProcedures()` of the workspace package `@procedures/fs`. Without that package, it
- * throws: a root that does not apply is an error, not a silent no-op.
+ * This function confines each procedure of the registry to a root, with `confineToRoot()` of the
+ * workspace package `@procedures/fs`. Without that package, it throws: a root that does not apply
+ * is an error, not a silent no-op.
  */
-async function confineFs(registry: ProcedureRegistry, root: string, discovered: readonly DiscoveredPackage[]): Promise<string> {
+async function confineRoot(
+  registry: ProcedureRegistry,
+  root: string,
+  discovered: readonly DiscoveredPackage[],
+): Promise<{ root: string; refused: string[] }> {
   const fsPackage = discovered.find((pkg) => pkg.name === "@procedures/fs");
   const file = fsPackage?.modulePath ? path.join(fsPackage.path, fsPackage.modulePath) : undefined;
   if (!file || !fs.existsSync(file)) {
     throw new Error("--fs-root needs the package @procedures/fs of the workspace: build packages/client-fs");
   }
-  const { confineFsProcedures } = (await import(pathToFileURL(file).href)) as { confineFsProcedures?: ConfineFs };
-  if (typeof confineFsProcedures !== "function") throw new Error("--fs-root needs a build of @procedures/fs with confineFsProcedures");
-  return confineFsProcedures(registry, root).root;
+  const { confineToRoot } = (await import(pathToFileURL(file).href)) as { confineToRoot?: ConfineToRoot };
+  if (typeof confineToRoot !== "function") throw new Error("--fs-root needs a build of @procedures/fs with confineToRoot");
+  const { root: folder, refused } = confineToRoot(registry, root);
+  return { root: folder, refused };
 }
 
 /**
@@ -265,8 +272,8 @@ async function moduleOfPackage(pkg: DiscoveredPackage): Promise<ProcedureModule
  * The registry of `mark` (roadmap 3.1): a registry of its own, built from the module of each
  * workspace package that declares `client.procedures`, with all the core procedures. The global
  * registry does not change for a package with a module entry. A package that fails to load gives
- * one warning line on stderr, as with `loadEcosystemProcedures()`. With `options.fsRoot`, the
- * `fs.*` procedures confine each path to the root.
+ * one warning line on stderr, as with `loadEcosystemProcedures()`. With `options.fsRoot`, each
+ * procedure keeps its paths in the root, or the root refuses it (`confineToRoot()`).
  */
 export async function loadEcosystemRegistry(verbose = false, warn = true, options: EcosystemOptions = {}): Promise<EcosystemRegistry> {
   const registry = createRegistry(allCoreModule);
@@ -289,7 +296,7 @@ export async function loadEcosystemRegistry(verbose = false, warn = true, option
     }
   }
   if (options.fsRoot === undefined) return { registry, loaded };
-  // After the last package: each fs.* procedure of the registry gets the handler of the root
-  const fsRoot = await confineFs(registry, options.fsRoot, discovered);
-  return { registry, loaded, fsRoot };
+  // After the last package: each procedure of the registry gets the rules of the root
+  const { root: fsRoot, refused } = await confineRoot(registry, options.fsRoot, discovered);
+  return { registry, loaded, fsRoot, refusedUnderRoot: refused };
 }

package/src/server-mode.ts

@@ -4,7 +4,7 @@
  * Runs the CLI as a persistent server, exposing all ecosystem procedures
  * via HTTP. The server has the registry of mark (the module of each package, roadmap 3.1) and
  * the host policy of the core (roadmap 2.3): the token in the lockfile, and the topics of
- * `--events`. With `--fs-root`, the `fs.*` procedures confine each path to the root.
+ * `--events`. With `--fs-root`, each procedure keeps its paths in the root, or the root refuses it.
  */
 
 import { print } from "./print.js";
@@ -83,7 +83,7 @@ export async function startServerMode(options: ServerModeOptions): Promise<void>
   if (verbose) {
     print.info("Loading ecosystem procedures...");
   }
-  const { registry, fsRoot } = await loadEcosystemRegistry(verbose, true, { fsRoot: options.fsRoot });
+  const { registry, fsRoot, refusedUnderRoot } = await loadEcosystemRegistry(verbose, true, { fsRoot: options.fsRoot });
 
   // Build transport config
   const transports = buildTransports(options);
@@ -145,7 +145,8 @@ export async function startServerMode(options: ServerModeOptions): Promise<void>
   }
   print.info(events.length > 0 ? `\nEvent topics (events.subscribe): ${events.join(", ")}` : "\nEvent topics: none (--events adds them)");
   if (fsRoot !== undefined) {
-    print.info(`File root: ${fsRoot} (fs.* refuses each path outside it)`);
+    print.info(`File root: ${fsRoot} (each procedure refuses a path outside it)`);
+    print.info(`  Refused under the root: ${refusedUnderRoot?.length ?? 0} procedures that the root cannot confine`);
   }
   print.info("\nPress Ctrl+C to stop.");