@procedures/cli-run 0.34.0 → 0.35.1

package/dist/module.d.ts

@@ -5,7 +5,7 @@
  *
  * Provides cli.run procedure for calling mark CLI commands via client-shell.
  */
-import { type ProcedureModule, type ProcedureRegistry } from "@procedures/client";
+import { type ProcedureModule, type PackageDefinition } from "@procedures/client";
 /**
  * The module of this package, for `createRegistry()`: its procedures as data. Importing this
  * file registers nothing. (`register.ts` registers the same procedures in the global registry.)
@@ -17,5 +17,5 @@ export default cliModule;
  * a registry. The default is the global registry. Importing this file registers nothing: the
  * `./register` entry starts this function (ARCHITECTURE-PROPOSALS-2026-10, P9).
  */
-export declare function registerCliProcedures(registry?: ProcedureRegistry): void;
+export declare const registerCliProcedures: PackageDefinition["register"];
 //# sourceMappingURL=module.d.ts.map

package/dist/module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../src/module.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,EAAiC,KAAK,eAAe,EAAuC,KAAK,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAgCtJ;;;GAGG;AACH,eAAO,MAAM,SAAS,EAAE,eAEL,CAAC;eAEL,SAAS;AAExB;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,QAAQ,GAAE,iBAAsC,GAAG,IAAI,CAE5F"}
+{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../src/module.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,EAAkC,KAAK,eAAe,EAAE,KAAK,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAoClH;;;GAGG;AACH,eAAO,MAAM,SAAS,EAAE,eAAmC,CAAC;eAE7C,SAAS;AAExB;;;;GAIG;AACH,eAAO,MAAM,qBAAqB,EAAE,iBAAiB,CAAC,UAAU,CAAuB,CAAC"}

package/dist/module.js

@@ -5,7 +5,7 @@
  *
  * Provides cli.run procedure for calling mark CLI commands via client-shell.
  */
-import { createProcedure, defineModule, PROCEDURE_REGISTRY, registerModules } from "@procedures/client";
+import { definePackage, createProcedure } from "@procedures/client";
 import shellModule from "@procedures/shell/module";
 import { cliRun } from "./procedures/cli/index.js";
 import { CliRunInputSchema, CliRunOutputSchema } from "./types.js";
@@ -32,20 +32,19 @@ const cliRunProcedure = createProcedure()
 // =============================================================================
 // Registration
 // =============================================================================
+const cliPackage = definePackage("@procedures/cli-run", [
+    cliRunProcedure,
+], [shellModule]);
 /**
  * The module of this package, for `createRegistry()`: its procedures as data. Importing this
  * file registers nothing. (`register.ts` registers the same procedures in the global registry.)
  */
-export const cliModule = defineModule("@procedures/cli-run", [
-    cliRunProcedure,
-], [shellModule]);
+export const cliModule = cliPackage.module;
 export default cliModule;
 /**
  * This function registers the procedures of @procedures/cli-run, and of the modules that it requires, in
  * a registry. The default is the global registry. Importing this file registers nothing: the
  * `./register` entry starts this function (ARCHITECTURE-PROPOSALS-2026-10, P9).
  */
-export function registerCliProcedures(registry = PROCEDURE_REGISTRY) {
-    registerModules(registry, [cliModule]);
-}
+export const registerCliProcedures = cliPackage.register;
 //# sourceMappingURL=module.js.map

package/dist/module.js.map

@@ -1 +1 @@
-{"version":3,"file":"module.js","sourceRoot":"","sources":["../src/module.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,EAAE,eAAe,EAAE,YAAY,EAAwB,kBAAkB,EAAE,eAAe,EAA0B,MAAM,oBAAoB,CAAC;AACtJ,OAAO,WAAW,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAuC,MAAM,YAAY,CAAC;AAGxG,gFAAgF;AAChF,oBAAoB;AACpB,gFAAgF;AAEhF,MAAM,eAAe,GAAG,eAAe,EAAE;KACtC,IAAI,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;KACpB,KAAK,CAAC,iBAAiB,CAAC;KACxB,MAAM,CAAC,kBAAkB,CAAC;KAC1B,IAAI,CAAC;IACJ,WAAW,EAAE,wBAAwB;IACrC,IAAI,EAAE,CAAC,MAAM,CAAC;IACd,MAAM,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE;IAClC,MAAM,EAAE,MAAM;IACd,mFAAmF;IACnF,4DAA4D;IAC5D,OAAO,EAAE,EAAE,KAAK,EAAE,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC,SAAS,CAAC,EAAE;CAC3D,CAAC;KACD,OAAO,CAAC,KAAK,EAAE,KAAkB,EAAE,GAAqB,EAAyB,EAAE;IAClF,OAAO,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;AAC5B,CAAC,CAAC;KACD,KAAK,EAAE,CAAC;AAEX,gFAAgF;AAChF,eAAe;AACf,gFAAgF;AAEhF;;;GAGG;AACH,MAAM,CAAC,MAAM,SAAS,GAAoB,YAAY,CAAC,qBAAqB,EAAE;IAC1E,eAAe;CAChB,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;AAEpB,eAAe,SAAS,CAAC;AAEzB;;;;GAIG;AACH,MAAM,UAAU,qBAAqB,CAAC,QAAQ,GAAsB,kBAAkB;IACpF,eAAe,CAAC,QAAQ,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;AACzC,CAAC"}
+{"version":3,"file":"module.js","sourceRoot":"","sources":["../src/module.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,EAAE,aAAa,EAAE,eAAe,EAAgD,MAAM,oBAAoB,CAAC;AAClH,OAAO,WAAW,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAuC,MAAM,YAAY,CAAC;AAGxG,gFAAgF;AAChF,oBAAoB;AACpB,gFAAgF;AAEhF,MAAM,eAAe,GAAG,eAAe,EAAE;KACtC,IAAI,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;KACpB,KAAK,CAAC,iBAAiB,CAAC;KACxB,MAAM,CAAC,kBAAkB,CAAC;KAC1B,IAAI,CAAC;IACJ,WAAW,EAAE,wBAAwB;IACrC,IAAI,EAAE,CAAC,MAAM,CAAC;IACd,MAAM,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE;IAClC,MAAM,EAAE,MAAM;IACd,mFAAmF;IACnF,4DAA4D;IAC5D,OAAO,EAAE,EAAE,KAAK,EAAE,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC,SAAS,CAAC,EAAE;CAC3D,CAAC;KACD,OAAO,CAAC,KAAK,EAAE,KAAkB,EAAE,GAAqB,EAAyB,EAAE;IAClF,OAAO,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;AAC5B,CAAC,CAAC;KACD,KAAK,EAAE,CAAC;AAEX,gFAAgF;AAChF,eAAe;AACf,gFAAgF;AAEhF,MAAM,UAAU,GAAsB,aAAa,CAAC,qBAAqB,EAAE;IACvE,eAAe;CAChB,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;AAEpB;;;GAGG;AACH,MAAM,CAAC,MAAM,SAAS,GAAoB,UAAU,CAAC,MAAM,CAAC;AAE5D,eAAe,SAAS,CAAC;AAEzB;;;;GAIG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAkC,UAAU,CAAC,QAAQ,CAAC"}

package/dist/procedures/cli/run.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../../src/procedures/cli/run.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAKH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAwBhE;;;;;;;;;GASG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,IAAI,CAAC,WAAW,EAAE,MAAM,GAAG,YAAY,GAAG,MAAM,CAAC,GAAG,MAAM,EAAE,CAUhG;AA8CD;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAsB,MAAM,CAC1B,KAAK,EAAE,WAAW,EAClB,GAAG,EAAE,gBAAgB,GACpB,OAAO,CAAC,YAAY,CAAC,CAiBvB"}
+{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../../src/procedures/cli/run.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAKH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAE3D,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAwBhE;;;;;;;;;GASG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,IAAI,CAAC,WAAW,EAAE,MAAM,GAAG,YAAY,GAAG,MAAM,CAAC,GAAG,MAAM,EAAE,CAUhG;AAKD;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAsB,MAAM,CAC1B,KAAK,EAAE,WAAW,EAClB,GAAG,EAAE,gBAAgB,GACpB,OAAO,CAAC,YAAY,CAAC,CAMvB"}

package/dist/procedures/cli/run.js

@@ -8,6 +8,7 @@
 import { existsSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
+import { defineCliTool, nodeScript } from "@procedures/shell/cli";
 /**
  * Find the mark CLI of the workspace that contains this package (packages/mark/dist/cli.js)
  */
@@ -51,30 +52,8 @@ export function buildMarkArgs(input) {
     }
     return args;
 }
-/**
- * Execute via shell (spawn node process)
- */
-async function shellExecution(input, ctx, startTime) {
-    const args = buildMarkArgs(input);
-    // Build shell input
-    const shellInput = {
-        command: process.execPath,
-        args: [resolveMarkCli(), ...args],
-    };
-    if (input.cwd !== undefined)
-        shellInput.cwd = input.cwd;
-    if (input.timeout !== undefined)
-        shellInput.timeout = input.timeout;
-    // Call shell.run
-    const result = await ctx.client.call(["shell", "run"], shellInput);
-    return {
-        exitCode: result.exitCode,
-        stdout: result.stdout,
-        stderr: result.stderr,
-        success: result.exitCode === 0,
-        duration: Date.now() - startTime,
-    };
-}
+/** The runner of mark: the mark CLI of the workspace, run with Node through `shell.run`. */
+const mark = defineCliTool({ name: "mark", resolve: () => nodeScript(resolveMarkCli()) });
 /**
  * Run a mark CLI command
  *
@@ -95,21 +74,10 @@ async function shellExecution(input, ctx, startTime) {
  * });
  */
 export async function cliRun(input, ctx) {
-    const startTime = Date.now();
-    try {
-        // Always through the mark CLI. Before, a second path sent the input straight to a running
-        // CLI server, without mark's argument mapping, so the two paths gave different results
-        // (a "dry run" wrote files), and it had its own copy of the lockfile logic (deep dive CLI-12).
-        return await shellExecution(input, ctx, startTime);
-    }
-    catch (error) {
-        return {
-            exitCode: 1,
-            stdout: "",
-            stderr: error instanceof Error ? error.message : String(error),
-            success: false,
-            duration: Date.now() - startTime,
-        };
-    }
+    // Always through the mark CLI. Before, a second path sent the input straight to a running
+    // CLI server, without mark's argument mapping, so the two paths gave different results
+    // (a "dry run" wrote files), and it had its own copy of the lockfile logic (deep dive CLI-12).
+    // The runner does not throw: an error gives exit code 1 and its message.
+    return mark.run(buildMarkArgs(input), { cwd: input.cwd, timeout: input.timeout }, ctx);
 }
 //# sourceMappingURL=run.js.map

package/dist/procedures/cli/run.js.map

@@ -1 +1 @@
-{"version":3,"file":"run.js","sourceRoot":"","sources":["../../../src/procedures/cli/run.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"run.js","sourceRoot":"","sources":["../../../src/procedures/cli/run.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAGlE;;GAEG;AACH,SAAS,cAAc;IACrB,IAAI,GAAG,GAAG,OAAO,CAAC,aAAa,CAAC,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IAClD,SAAS,CAAC;QACR,IAAI,UAAU,CAAC,IAAI,CAAC,GAAG,EAAE,qBAAqB,CAAC,CAAC,EAAE,CAAC;YACjD,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;YAC5D,IAAI,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;gBACpB,OAAO,GAAG,CAAC;YACb,CAAC;YACD,MAAM;QACR,CAAC;QACD,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;QAC5B,IAAI,MAAM,KAAK,GAAG,EAAE,CAAC;YACnB,MAAM;QACR,CAAC;QACD,GAAG,GAAG,MAAM,CAAC;IACf,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,2FAA2F,CAAC,CAAC;AAC/G,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,UAAU,aAAa,CAAC,KAAwD;IACpF,MAAM,IAAI,GAAa,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;IACvC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE,CAAC;QAC5D,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI;YAAE,SAAS;QACpD,IAAI,CAAC,IAAI,CAAC,KAAK,GAAG,IAAI,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IACrF,CAAC;IACD,IAAI,KAAK,CAAC,UAAU,IAAI,KAAK,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACpD,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;IACnD,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,4FAA4F;AAC5F,MAAM,IAAI,GAAG,aAAa,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,cAAc,EAAE,CAAC,EAAE,CAAC,CAAC;AAE1F;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,CAAC,KAAK,UAAU,MAAM,CAC1B,KAAkB,EAClB,GAAqB;IAErB,0FAA0F;IAC1F,uFAAuF;IACvF,+FAA+F;IAC/F,yEAAyE;IACzE,OAAO,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,EAAE,GAAG,CAAC,CAAC;AACzF,CAAC"}

package/dist/types.d.ts

@@ -4,6 +4,7 @@
  * client-cli wraps the mark CLI as procedures using client-shell.
  */
 import { z } from "zod";
+import { type CliToolOutput } from "@procedures/shell/cli";
 export declare const CliRunInputSchema: z.ZodObject<{
     path: z.ZodArray<z.ZodString>;
     args: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnion<readonly [z.ZodString, z.ZodNumber, z.ZodBoolean]>>>;
@@ -12,17 +13,8 @@ export declare const CliRunInputSchema: z.ZodObject<{
     timeout: z.ZodOptional<z.ZodNumber>;
 }>;
 export type CliRunInput = z.infer<typeof CliRunInputSchema>;
-export interface CliRunOutput {
-    /** Exit code of the command */
-    exitCode: number;
-    /** Standard output */
-    stdout: string;
-    /** Standard error */
-    stderr: string;
-    /** Whether command succeeded (exit code 0) */
-    success: boolean;
-    /** Duration in milliseconds */
-    duration: number;
+/** The result of cli.run: the shared result of a CLI tool (`@procedures/shell/cli`). */
+export interface CliRunOutput extends CliToolOutput {
 }
 /** The output schema of cli.run (roadmap 2.1). Loose: a field that it does not name stays. */
 export declare const CliRunOutputSchema: z.ZodType<CliRunOutput>;

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAMxB,eAAO,MAAM,iBAAiB,EAAE,CAAC,CAAC,SAAS,CAAC;IAC1C,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IAC9B,IAAI,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7G,UAAU,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;IACnD,GAAG,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IAChC,OAAO,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;CACrC,CAWC,CAAC;AAEH,MAAM,MAAM,WAAW,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAE5D,MAAM,WAAW,YAAY;IAC3B,+BAA+B;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,sBAAsB;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,qBAAqB;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,8CAA8C;IAC9C,OAAO,EAAE,OAAO,CAAC;IACjB,+BAA+B;IAC/B,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,8FAA8F;AAC9F,eAAO,MAAM,kBAAkB,EAAE,CAAC,CAAC,OAAO,CAAC,YAAY,CAMrD,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAuB,KAAK,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAMhF,eAAO,MAAM,iBAAiB,EAAE,CAAC,CAAC,SAAS,CAAC;IAC1C,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IAC9B,IAAI,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7G,UAAU,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;IACnD,GAAG,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IAChC,OAAO,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;CACrC,CAWC,CAAC;AAEH,MAAM,MAAM,WAAW,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAE5D,wFAAwF;AACxF,MAAM,WAAW,YAAa,SAAQ,aAAa;CAAG;AAEtD,8FAA8F;AAC9F,eAAO,MAAM,kBAAkB,EAAE,CAAC,CAAC,OAAO,CAAC,YAAY,CAA+B,CAAC"}

package/dist/types.js

@@ -4,6 +4,7 @@
  * client-cli wraps the mark CLI as procedures using client-shell.
  */
 import { z } from "zod";
+import { cliToolOutputSchema } from "@procedures/shell/cli";
 // =============================================================================
 // cli.run Types
 // =============================================================================
@@ -20,11 +21,5 @@ export const CliRunInputSchema = z.object({
     timeout: z.number().optional().describe("Timeout in milliseconds"),
 });
 /** The output schema of cli.run (roadmap 2.1). Loose: a field that it does not name stays. */
-export const CliRunOutputSchema = z.looseObject({
-    exitCode: z.number().describe("The exit code of mark"),
-    stdout: z.string().describe("The standard output of mark"),
-    stderr: z.string().describe("The standard error of mark"),
-    success: z.boolean().describe("True when the exit code is 0"),
-    duration: z.number().describe("The time of the command, in milliseconds"),
-});
+export const CliRunOutputSchema = cliToolOutputSchema("mark");
 //# sourceMappingURL=types.js.map

package/dist/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,gFAAgF;AAChF,gBAAgB;AAChB,gFAAgF;AAEhF,MAAM,CAAC,MAAM,iBAAiB,GAMzB,CAAC,CAAC,MAAM,CAAC;IACZ,qEAAqE;IACrE,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,CAAC,sEAAsE,CAAC;IAC1G,+EAA+E;IAC/E,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,8EAA8E,CAAC;IAC9K,0CAA0C;IAC1C,UAAU,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,qCAAqC,CAAC;IAC1F,wBAAwB;IACxB,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,mBAAmB,CAAC;IACxD,8BAA8B;IAC9B,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,yBAAyB,CAAC;CACnE,CAAC,CAAC;AAiBH,8FAA8F;AAC9F,MAAM,CAAC,MAAM,kBAAkB,GAA4B,CAAC,CAAC,WAAW,CAAC;IACvE,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,uBAAuB,CAAC;IACtD,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,6BAA6B,CAAC;IAC1D,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,4BAA4B,CAAC;IACzD,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,CAAC,8BAA8B,CAAC;IAC7D,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,0CAA0C,CAAC;CAC1E,CAAC,CAAC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,mBAAmB,EAAsB,MAAM,uBAAuB,CAAC;AAEhF,gFAAgF;AAChF,gBAAgB;AAChB,gFAAgF;AAEhF,MAAM,CAAC,MAAM,iBAAiB,GAMzB,CAAC,CAAC,MAAM,CAAC;IACZ,qEAAqE;IACrE,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,CAAC,sEAAsE,CAAC;IAC1G,+EAA+E;IAC/E,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,8EAA8E,CAAC;IAC9K,0CAA0C;IAC1C,UAAU,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,qCAAqC,CAAC;IAC1F,wBAAwB;IACxB,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,mBAAmB,CAAC;IACxD,8BAA8B;IAC9B,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,yBAAyB,CAAC;CACnE,CAAC,CAAC;AAOH,8FAA8F;AAC9F,MAAM,CAAC,MAAM,kBAAkB,GAA4B,mBAAmB,CAAC,MAAM,CAAC,CAAC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package",
   "name": "@procedures/cli-run",
-  "version": "0.34.0",
+  "version": "0.35.1",
   "description": "Run any mark CLI command as a procedure (cli.run) with a safe argv mapping: no shell, typed flags and captured output.",
   "keywords": [
     "cli",
@@ -60,8 +60,8 @@
     "provenance": true
   },
   "dependencies": {
-    "@procedures/client": "0.34.0",
-    "@procedures/shell": "0.34.0",
+    "@procedures/client": "0.35.1",
+    "@procedures/shell": "0.35.1",
     "zod": "^4.6.5"
   },
   "devDependencies": {

package/src/module.ts

@@ -7,7 +7,7 @@
  */
 
 
-import { createProcedure, defineModule, type ProcedureModule, PROCEDURE_REGISTRY, registerModules, type ProcedureRegistry } from "@procedures/client";
+import { definePackage, createProcedure, type ProcedureModule, type PackageDefinition } from "@procedures/client";
 import shellModule from "@procedures/shell/module";
 import { cliRun } from "./procedures/cli/index.js";
 import { CliRunInputSchema, CliRunOutputSchema, type CliRunInput, type CliRunOutput } from "./types.js";
@@ -39,13 +39,15 @@ const cliRunProcedure = createProcedure()
 // Registration
 // =============================================================================
 
+const cliPackage: PackageDefinition = definePackage("@procedures/cli-run", [
+    cliRunProcedure,
+  ], [shellModule]);
+
 /**
  * The module of this package, for `createRegistry()`: its procedures as data. Importing this
  * file registers nothing. (`register.ts` registers the same procedures in the global registry.)
  */
-export const cliModule: ProcedureModule = defineModule("@procedures/cli-run", [
-    cliRunProcedure,
-  ], [shellModule]);
+export const cliModule: ProcedureModule = cliPackage.module;
 
 export default cliModule;
 
@@ -54,6 +56,4 @@ export default cliModule;
  * a registry. The default is the global registry. Importing this file registers nothing: the
  * `./register` entry starts this function (ARCHITECTURE-PROPOSALS-2026-10, P9).
  */
-export function registerCliProcedures(registry: ProcedureRegistry = PROCEDURE_REGISTRY): void {
-  registerModules(registry, [cliModule]);
-}
+export const registerCliProcedures: PackageDefinition["register"] = cliPackage.register;

package/src/procedures/cli/run.ts

@@ -10,6 +10,7 @@ import { existsSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
 import type { ProcedureContext } from "@procedures/client";
+import { defineCliTool, nodeScript } from "@procedures/shell/cli";
 import type { CliRunInput, CliRunOutput } from "../../types.js";
 
 /**
@@ -56,49 +57,8 @@ export function buildMarkArgs(input: Pick<CliRunInput, "path" | "positional" | "
   return args;
 }
 
-/**
- * Execute via shell (spawn node process)
- */
-async function shellExecution(
-  input: CliRunInput,
-  ctx: ProcedureContext,
-  startTime: number
-): Promise<CliRunOutput> {
-  const args = buildMarkArgs(input);
-
-  // Build shell input
-  const shellInput: {
-    command: string;
-    args: string[];
-    cwd?: string | undefined;
-    timeout?: number | undefined;
-  } = {
-    command: process.execPath,
-    args: [resolveMarkCli(), ...args],
-  };
-
-  if (input.cwd !== undefined) shellInput.cwd = input.cwd;
-  if (input.timeout !== undefined) shellInput.timeout = input.timeout;
-
-  // Call shell.run
-  const result = await ctx.client.call<
-    typeof shellInput,
-    {
-      exitCode: number;
-      stdout: string;
-      stderr: string;
-      signal?: string | undefined;
-    }
-  >(["shell", "run"], shellInput);
-
-  return {
-    exitCode: result.exitCode,
-    stdout: result.stdout,
-    stderr: result.stderr,
-    success: result.exitCode === 0,
-    duration: Date.now() - startTime,
-  };
-}
+/** The runner of mark: the mark CLI of the workspace, run with Node through `shell.run`. */
+const mark = defineCliTool({ name: "mark", resolve: () => nodeScript(resolveMarkCli()) });
 
 /**
  * Run a mark CLI command
@@ -123,20 +83,9 @@ export async function cliRun(
   input: CliRunInput,
   ctx: ProcedureContext
 ): Promise<CliRunOutput> {
-  const startTime = Date.now();
-
-  try {
-    // Always through the mark CLI. Before, a second path sent the input straight to a running
-    // CLI server, without mark's argument mapping, so the two paths gave different results
-    // (a "dry run" wrote files), and it had its own copy of the lockfile logic (deep dive CLI-12).
-    return await shellExecution(input, ctx, startTime);
-  } catch (error) {
-    return {
-      exitCode: 1,
-      stdout: "",
-      stderr: error instanceof Error ? error.message : String(error),
-      success: false,
-      duration: Date.now() - startTime,
-    };
-  }
+  // Always through the mark CLI. Before, a second path sent the input straight to a running
+  // CLI server, without mark's argument mapping, so the two paths gave different results
+  // (a "dry run" wrote files), and it had its own copy of the lockfile logic (deep dive CLI-12).
+  // The runner does not throw: an error gives exit code 1 and its message.
+  return mark.run(buildMarkArgs(input), { cwd: input.cwd, timeout: input.timeout }, ctx);
 }

package/src/types.ts

@@ -5,6 +5,7 @@
  */
 
 import { z } from "zod";
+import { cliToolOutputSchema, type CliToolOutput } from "@procedures/shell/cli";
 
 // =============================================================================
 // cli.run Types
@@ -31,24 +32,8 @@ export const CliRunInputSchema: z.ZodObject<{
 
 export type CliRunInput = z.infer<typeof CliRunInputSchema>;
 
-export interface CliRunOutput {
-  /** Exit code of the command */
-  exitCode: number;
-  /** Standard output */
-  stdout: string;
-  /** Standard error */
-  stderr: string;
-  /** Whether command succeeded (exit code 0) */
-  success: boolean;
-  /** Duration in milliseconds */
-  duration: number;
-}
+/** The result of cli.run: the shared result of a CLI tool (`@procedures/shell/cli`). */
+export interface CliRunOutput extends CliToolOutput {}
 
 /** The output schema of cli.run (roadmap 2.1). Loose: a field that it does not name stays. */
-export const CliRunOutputSchema: z.ZodType<CliRunOutput> = z.looseObject({
-  exitCode: z.number().describe("The exit code of mark"),
-  stdout: z.string().describe("The standard output of mark"),
-  stderr: z.string().describe("The standard error of mark"),
-  success: z.boolean().describe("True when the exit code is 0"),
-  duration: z.number().describe("The time of the command, in milliseconds"),
-});
+export const CliRunOutputSchema: z.ZodType<CliRunOutput> = cliToolOutputSchema("mark");