@procedures/tailscale 0.33.0 → 0.35.0

package/dist/argv.d.ts

@@ -1,21 +1,7 @@
 /**
  * The argv of a CLI command from a command path, named arguments and positional arguments. The
- * procedures start the program with argv, never through a shell.
+ * procedures start the program with argv, never through a shell. The helpers are the shared ones
+ * of `@procedures/shell/cli` (dedupe review F2): this file keeps the exports of this package.
  */
-export type ArgValue = string | number | boolean | readonly string[];
-/** A flag name: lowercase letters, digits and hyphens. */
-export declare const FLAG_NAME: RegExp;
-/**
- * This function gives the argv: the path, then each named argument, then `--` and the positional
- * arguments. `true` gives `--key`, `false` gives nothing, a list gives `--key=value` for each
- * value, and another value gives `--key=value`.
- */
-export declare function buildArgv(input: {
-    readonly path: readonly string[];
-    readonly args?: Readonly<Record<string, ArgValue>> | undefined;
-    readonly positional?: readonly string[] | undefined;
-    readonly flags?: readonly string[] | undefined;
-}): string[];
-/** This function reads JSON output: one document, or one document on each line (NDJSON). */
-export declare function parseJsonOutput(stdout: string): unknown;
+export { buildArgv, parseJsonOutput, FLAG_NAME, type ArgValue } from "@procedures/shell/cli";
 //# sourceMappingURL=argv.d.ts.map

package/dist/argv.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"argv.d.ts","sourceRoot":"","sources":["../src/argv.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,MAAM,MAAM,QAAQ,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,SAAS,MAAM,EAAE,CAAC;AAErE,0DAA0D;AAC1D,eAAO,MAAM,SAAS,EAAE,MAA4B,CAAC;AAErD;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,KAAK,EAAE;IAC/B,QAAQ,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,CAAC;IACjC,QAAQ,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,GAAG,SAAS,CAAC;IAC/D,QAAQ,CAAC,UAAU,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,CAAC;IACpD,QAAQ,CAAC,KAAK,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,CAAC;CAChD,GAAG,MAAM,EAAE,CAWX;AAED,4FAA4F;AAC5F,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAavD"}
+{"version":3,"file":"argv.d.ts","sourceRoot":"","sources":["../src/argv.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,SAAS,EAAE,KAAK,QAAQ,EAAE,MAAM,uBAAuB,CAAC"}

package/dist/argv.js

@@ -1,49 +1,7 @@
 /**
  * The argv of a CLI command from a command path, named arguments and positional arguments. The
- * procedures start the program with argv, never through a shell.
+ * procedures start the program with argv, never through a shell. The helpers are the shared ones
+ * of `@procedures/shell/cli` (dedupe review F2): this file keeps the exports of this package.
  */
-/** A flag name: lowercase letters, digits and hyphens. */
-export const FLAG_NAME = /^[a-z][a-z0-9-]*$/;
-/**
- * This function gives the argv: the path, then each named argument, then `--` and the positional
- * arguments. `true` gives `--key`, `false` gives nothing, a list gives `--key=value` for each
- * value, and another value gives `--key=value`.
- */
-export function buildArgv(input) {
-    const argv = [...input.path, ...(input.flags ?? [])];
-    for (const [key, value] of Object.entries(input.args ?? {})) {
-        if (!FLAG_NAME.test(key))
-            throw new Error(`The argument name "${key}" is not a flag name (lowercase letters, digits, hyphens)`);
-        if (value === false)
-            continue;
-        if (value === true)
-            argv.push(`--${key}`);
-        else if (Array.isArray(value))
-            for (const item of value)
-                argv.push(`--${key}=${item}`);
-        else
-            argv.push(`--${key}=${String(value)}`);
-    }
-    if (input.positional && input.positional.length > 0)
-        argv.push("--", ...input.positional);
-    return argv;
-}
-/** This function reads JSON output: one document, or one document on each line (NDJSON). */
-export function parseJsonOutput(stdout) {
-    const text = stdout.trim();
-    if (text.length === 0)
-        return undefined;
-    try {
-        return JSON.parse(text);
-    }
-    catch {
-        const lines = text.split(/\r?\n/).filter((line) => line.trim().length > 0);
-        try {
-            return lines.map((line) => JSON.parse(line));
-        }
-        catch {
-            return undefined;
-        }
-    }
-}
+export { buildArgv, parseJsonOutput, FLAG_NAME } from "@procedures/shell/cli";
 //# sourceMappingURL=argv.js.map

package/dist/argv.js.map

@@ -1 +1 @@
-{"version":3,"file":"argv.js","sourceRoot":"","sources":["../src/argv.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,0DAA0D;AAC1D,MAAM,CAAC,MAAM,SAAS,GAAW,mBAAmB,CAAC;AAErD;;;;GAIG;AACH,MAAM,UAAU,SAAS,CAAC,KAKzB;IACC,MAAM,IAAI,GAAG,CAAC,GAAG,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,CAAC;IACrD,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE,CAAC;QAC5D,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,sBAAsB,GAAG,2DAA2D,CAAC,CAAC;QAChI,IAAI,KAAK,KAAK,KAAK;YAAE,SAAS;QAC9B,IAAI,KAAK,KAAK,IAAI;YAAE,IAAI,CAAC,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC;aACrC,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;YAAE,KAAK,MAAM,IAAI,IAAI,KAAK;gBAAE,IAAI,CAAC,IAAI,CAAC,KAAK,GAAG,IAAI,IAAI,EAAE,CAAC,CAAC;;YAClF,IAAI,CAAC,IAAI,CAAC,KAAK,GAAG,IAAI,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAC9C,CAAC;IACD,IAAI,KAAK,CAAC,UAAU,IAAI,KAAK,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC;QAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,KAAK,CAAC,UAAU,CAAC,CAAC;IAC1F,OAAO,IAAI,CAAC;AACd,CAAC;AAED,4FAA4F;AAC5F,MAAM,UAAU,eAAe,CAAC,MAAc;IAC5C,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC;IAC3B,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IACxC,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAC3E,IAAI,CAAC;YACH,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAY,CAAC,CAAC;QAC1D,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,SAAS,CAAC;QACnB,CAAC;IACH,CAAC;AACH,CAAC"}
+{"version":3,"file":"argv.js","sourceRoot":"","sources":["../src/argv.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,SAAS,EAAiB,MAAM,uBAAuB,CAAC"}

package/dist/module.d.ts

@@ -1,5 +1,6 @@
 /**
- * The procedures of @procedures/tailscale as data. Importing this file registers nothing.
+ * The procedures of @procedures/tailscale as data. Importing this file registers nothing. The
+ * module requires the module of `@procedures/shell`: `tailscale.run` calls `shell.run`.
  */
 import { type ProcedureModule, type ProcedureRegistry } from "@procedures/client";
 import { type TailscaleProceduresOptions } from "./procedures.js";

package/dist/module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../src/module.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAqD,KAAK,eAAe,EAAE,KAAK,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACrI,OAAO,EAAkD,KAAK,0BAA0B,EAAE,MAAM,iBAAiB,CAAC;AAElH,eAAO,MAAM,eAAe,EAAE,eAA4E,CAAC;eAE5F,eAAe;AAE9B;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,GAAE,0BAA+B,GAAG,eAAe,CAG/F;AAED;;;GAGG;AACH,wBAAgB,2BAA2B,CAAC,QAAQ,GAAE,iBAAsC,GAAG,IAAI,CAElG"}
+{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../src/module.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAqD,KAAK,eAAe,EAAE,KAAK,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAErI,OAAO,EAAkD,KAAK,0BAA0B,EAAE,MAAM,iBAAiB,CAAC;AAElH,eAAO,MAAM,eAAe,EAAE,eAA2F,CAAC;eAE3G,eAAe;AAE9B;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,GAAE,0BAA+B,GAAG,eAAe,CAG/F;AAED;;;GAGG;AACH,wBAAgB,2BAA2B,CAAC,QAAQ,GAAE,iBAAsC,GAAG,IAAI,CAElG"}

package/dist/module.js

@@ -1,9 +1,11 @@
 /**
- * The procedures of @procedures/tailscale as data. Importing this file registers nothing.
+ * The procedures of @procedures/tailscale as data. Importing this file registers nothing. The
+ * module requires the module of `@procedures/shell`: `tailscale.run` calls `shell.run`.
  */
 import { defineModule, registerModules, PROCEDURE_REGISTRY } from "@procedures/client";
+import shellModule from "@procedures/shell/module";
 import { createTailscaleProcedures, tailscaleProcedures } from "./procedures.js";
-export const tailscaleModule = defineModule("@procedures/tailscale", tailscaleProcedures);
+export const tailscaleModule = defineModule("@procedures/tailscale", tailscaleProcedures, [shellModule]);
 export default tailscaleModule;
 /**
  * This function gives the module with the settings of the host: the tailscale program. Without
@@ -16,7 +18,7 @@ export default tailscaleModule;
 export function createTailscaleModule(options = {}) {
     if (options.executable === undefined)
         return tailscaleModule;
-    return defineModule("@procedures/tailscale", createTailscaleProcedures(options));
+    return defineModule("@procedures/tailscale", createTailscaleProcedures(options), [shellModule]);
 }
 /**
  * This function registers the procedures of @procedures/tailscale in a registry. The default is the

package/dist/module.js.map

@@ -1 +1 @@
-{"version":3,"file":"module.js","sourceRoot":"","sources":["../src/module.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,kBAAkB,EAAgD,MAAM,oBAAoB,CAAC;AACrI,OAAO,EAAE,yBAAyB,EAAE,mBAAmB,EAAmC,MAAM,iBAAiB,CAAC;AAElH,MAAM,CAAC,MAAM,eAAe,GAAoB,YAAY,CAAC,uBAAuB,EAAE,mBAAmB,CAAC,CAAC;AAE3G,eAAe,eAAe,CAAC;AAE/B;;;;;;;GAOG;AACH,MAAM,UAAU,qBAAqB,CAAC,OAAO,GAA+B,EAAE;IAC5E,IAAI,OAAO,CAAC,UAAU,KAAK,SAAS;QAAE,OAAO,eAAe,CAAC;IAC7D,OAAO,YAAY,CAAC,uBAAuB,EAAE,yBAAyB,CAAC,OAAO,CAAC,CAAC,CAAC;AACnF,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,2BAA2B,CAAC,QAAQ,GAAsB,kBAAkB;IAC1F,eAAe,CAAC,QAAQ,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC;AAC/C,CAAC"}
+{"version":3,"file":"module.js","sourceRoot":"","sources":["../src/module.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,kBAAkB,EAAgD,MAAM,oBAAoB,CAAC;AACrI,OAAO,WAAW,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,yBAAyB,EAAE,mBAAmB,EAAmC,MAAM,iBAAiB,CAAC;AAElH,MAAM,CAAC,MAAM,eAAe,GAAoB,YAAY,CAAC,uBAAuB,EAAE,mBAAmB,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;AAE1H,eAAe,eAAe,CAAC;AAE/B;;;;;;;GAOG;AACH,MAAM,UAAU,qBAAqB,CAAC,OAAO,GAA+B,EAAE;IAC5E,IAAI,OAAO,CAAC,UAAU,KAAK,SAAS;QAAE,OAAO,eAAe,CAAC;IAC7D,OAAO,YAAY,CAAC,uBAAuB,EAAE,yBAAyB,CAAC,OAAO,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;AAClG,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,2BAA2B,CAAC,QAAQ,GAAsB,kBAAkB;IAC1F,eAAe,CAAC,QAAQ,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC;AAC/C,CAAC"}

package/dist/procedures.d.ts

@@ -5,6 +5,10 @@
  * The program comes from the host, never from the input (audit pass 2, O55): the `executable`
  * option of `createTailscaleModule()`, then `TAILSCALE_EXE`, then the install folder, then
  * `tailscale`. Before, an input `executable` let the caller start any program.
+ *
+ * The procedure starts tailscale with argv through a nested `shell.run` call, the runner of
+ * `defineCliTool()` (tracker item O64). The engine applies its rules to that call, and a cancel
+ * stops the program.
  */
 import { type AnyProcedure } from "@procedures/client";
 /** This function gives the tailscale program: the explicit value, TAILSCALE_EXE, the Windows install folder, then tailscale. */

package/dist/procedures.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"procedures.d.ts","sourceRoot":"","sources":["../src/procedures.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,EAA+B,KAAK,YAAY,EAAyB,MAAM,oBAAoB,CAAC;AAQ3G,gIAAgI;AAChI,wBAAgB,mBAAmB,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAK7D;AAuCD,2GAA2G;AAC3G,MAAM,WAAW,0BAA0B;IACzC,gHAAgH;IAChH,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC1C;AAED;;;GAGG;AACH,wBAAgB,yBAAyB,CAAC,OAAO,GAAE,0BAA+B,GAAG,YAAY,EAAE,CAoClG;AAED,eAAO,MAAM,mBAAmB,EAAE,YAAY,EAAgC,CAAC;AAE/E,eAAO,MAAM,qBAAqB,EAAE,YAAsC,CAAC"}
+{"version":3,"file":"procedures.d.ts","sourceRoot":"","sources":["../src/procedures.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAGH,OAAO,EAAmB,KAAK,YAAY,EAAyB,MAAM,oBAAoB,CAAC;AAQ/F,gIAAgI;AAChI,wBAAgB,mBAAmB,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAK7D;AA+CD,2GAA2G;AAC3G,MAAM,WAAW,0BAA0B;IACzC,gHAAgH;IAChH,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC1C;AAED;;;GAGG;AACH,wBAAgB,yBAAyB,CAAC,OAAO,GAAE,0BAA+B,GAAG,YAAY,EAAE,CAsClG;AAED,eAAO,MAAM,mBAAmB,EAAE,YAAY,EAAgC,CAAC;AAE/E,eAAO,MAAM,qBAAqB,EAAE,YAAsC,CAAC"}

package/dist/procedures.js

@@ -5,10 +5,14 @@
  * The program comes from the host, never from the input (audit pass 2, O55): the `executable`
  * option of `createTailscaleModule()`, then `TAILSCALE_EXE`, then the install folder, then
  * `tailscale`. Before, an input `executable` let the caller start any program.
+ *
+ * The procedure starts tailscale with argv through a nested `shell.run` call, the runner of
+ * `defineCliTool()` (tracker item O64). The engine applies its rules to that call, and a cancel
+ * stops the program.
  */
 import { existsSync } from "node:fs";
-import { createProcedure, zodAdapter } from "@procedures/client";
-import { runCommand } from "@procedures/shell/command";
+import { createProcedure } from "@procedures/client";
+import { defineCliTool } from "@procedures/shell/cli";
 import { z } from "zod";
 import { buildArgv, parseJsonOutput } from "./argv.js";
 /** The Windows installer does not put tailscale on the PATH. */
@@ -47,20 +51,29 @@ const RunOutputSchema = z.object({
     json: z.unknown().optional(),
     actionUrl: z.string().optional(),
 });
+/**
+ * True when the output of `shell.run` tells that the program did not start. `shell.run` gives
+ * exit code 1 and the error of the start as the standard error, for example `spawn tailscale ENOENT`.
+ */
+function didNotStart(result) {
+    return result.exitCode === 1 && result.stdout === "" && /^spawn .+ E[A-Z0-9]+$/.test(result.stderr);
+}
 /**
  * This function gives the procedures of this package with the settings of the host. The program
  * of `tailscale.run` is `executable`, or the default of `tailscaleExecutable()` at each call.
  */
 export function createTailscaleProcedures(options = {}) {
+    const tailscale = defineCliTool({ name: "tailscale", resolve: () => tailscaleExecutable(options.executable) });
     const run = createProcedure()
         .path(["tailscale", "run"])
-        .input(zodAdapter(RunInputSchema))
-        .output(zodAdapter(RunOutputSchema))
+        .input(RunInputSchema)
+        .output(RunOutputSchema)
         .meta({
         description: "Run a tailscale command (status, ip, serve, up, down)",
         args: ["path"],
         shorts: { timeout: "t" },
         output: "json",
+        calls: ["shell.run"],
         // up, down and serve change the network of the host. ssh starts a program on another host.
         effects: { reads: ["network"], writes: ["network", "process"], destructive: true },
     })
@@ -71,9 +84,9 @@ export function createTailscaleProcedures(options = {}) {
             args: input.args,
             positional: input.positional,
         });
-        const result = await runCommand(tailscaleExecutable(options.executable), { args: argv, timeout: input.timeout, signal: ctx?.signal });
-        if (result.error)
-            throw new Error(`tailscale did not start: ${result.error}`);
+        const result = await tailscale.call(argv, { timeout: input.timeout }, ctx);
+        if (didNotStart(result))
+            throw new Error(`tailscale did not start: ${result.stderr}`);
         const json = input.json ? parseJsonOutput(result.stdout) : undefined;
         // tailscale prints an address to open when a login or a feature needs the owner
         const actionUrl = /https:\/\/login\.tailscale\.com\/\S+/.exec(`${result.stdout}\n${result.stderr}`)?.[0];

package/dist/procedures.js.map

@@ -1 +1 @@
-{"version":3,"file":"procedures.js","sourceRoot":"","sources":["../src/procedures.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,eAAe,EAAE,UAAU,EAA4C,MAAM,oBAAoB,CAAC;AAC3G,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,SAAS,EAAE,eAAe,EAAiB,MAAM,WAAW,CAAC;AAEtE,gEAAgE;AAChE,MAAM,YAAY,GAAG,6CAA6C,CAAC;AAEnE,gIAAgI;AAChI,MAAM,UAAU,mBAAmB,CAAC,QAAiB;IACnD,IAAI,QAAQ,KAAK,SAAS;QAAE,OAAO,QAAQ,CAAC;IAC5C,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;IAC7C,IAAI,OAAO;QAAE,OAAO,OAAO,CAAC;IAC5B,OAAO,OAAO,CAAC,QAAQ,KAAK,OAAO,IAAI,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,WAAW,CAAC;AAC/F,CAAC;AAED,MAAM,cAAc,GAAG,CAAC,CAAC,MAAM,CAAC;IAC9B,IAAI,EAAE,CAAC;SACJ,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;SACzC,GAAG,CAAC,CAAC,CAAC;SACN,QAAQ,CAAC,8EAA8E,CAAC;IAC3F,UAAU,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,0BAA0B,CAAC;IAC/E,IAAI,EAAE,CAAC;SACJ,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,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;SACvF,QAAQ,EAAE;SACV,QAAQ,CAAC,qCAAqC,CAAC;IAClD,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,8FAA8F,CAAC;IACzI,0FAA0F;IAC1F,UAAU,EAAE,CAAC;SACV,KAAK,CAAC,EAAE,KAAK,EAAE,iHAAiH,EAAE,CAAC;SACnI,QAAQ,EAAE;IACb,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,kDAAkD,CAAC;CAClH,CAAC,CAAC;AAYH,MAAM,eAAe,GAAG,CAAC,CAAC,MAAM,CAAC;IAC/B,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE;IACpB,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE;IACpB,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;IAClB,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;IAClB,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;IAC5B,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CACjC,CAAC,CAAC;AAQH;;;GAGG;AACH,MAAM,UAAU,yBAAyB,CAAC,OAAO,GAA+B,EAAE;IAChF,MAAM,GAAG,GAAG,eAAe,EAAE;SAC1B,IAAI,CAAC,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;SAC1B,KAAK,CAAC,UAAU,CAAW,cAAc,CAAC,CAAC;SAC3C,MAAM,CAAC,UAAU,CAAY,eAAe,CAAC,CAAC;SAC9C,IAAI,CAAC;QACJ,WAAW,EAAE,uDAAuD;QACpE,IAAI,EAAE,CAAC,MAAM,CAAC;QACd,MAAM,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE;QACxB,MAAM,EAAE,MAAM;QACd,2FAA2F;QAC3F,OAAO,EAAE,EAAE,KAAK,EAAE,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC,SAAS,EAAE,SAAS,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE;KACnF,CAAC;SACD,OAAO,CAAC,KAAK,EAAE,KAAe,EAAE,GAAsB,EAAsB,EAAE;QAC7E,MAAM,IAAI,GAAG,SAAS,CAAC;YACrB,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE;YACnC,IAAI,EAAE,KAAK,CAAC,IAA4C;YACxD,UAAU,EAAE,KAAK,CAAC,UAAU;SAC7B,CAAC,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,mBAAmB,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,CAAC;QACtI,IAAI,MAAM,CAAC,KAAK;YAAE,MAAM,IAAI,KAAK,CAAC,4BAA4B,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;QAC9E,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,eAAe,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACrE,gFAAgF;QAChF,MAAM,SAAS,GAAG,sCAAsC,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,KAAK,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QACzG,OAAO;YACL,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,OAAO,EAAE,MAAM,CAAC,QAAQ,KAAK,CAAC;YAC9B,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,GAAG,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACvC,GAAG,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAClD,CAAC;IACJ,CAAC,CAAC;SACD,KAAK,EAAkB,CAAC;IAC3B,OAAO,CAAC,GAAG,CAAC,CAAC;AACf,CAAC;AAED,MAAM,CAAC,MAAM,mBAAmB,GAAmB,yBAAyB,EAAE,CAAC;AAE/E,MAAM,CAAC,MAAM,qBAAqB,GAAiB,mBAAmB,CAAC,CAAC,CAAE,CAAC"}
+{"version":3,"file":"procedures.js","sourceRoot":"","sources":["../src/procedures.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package",
   "name": "@procedures/tailscale",
-  "version": "0.33.0",
+  "version": "0.35.0",
   "description": "The tailscale CLI as one procedure: status, ip, serve, up and down, with JSON output.",
   "keywords": [
     "tailscale",
@@ -56,9 +56,9 @@
     "provenance": true
   },
   "dependencies": {
-    "@procedures/client": "0.33.0",
+    "@procedures/client": "0.35.0",
     "zod": "^4.6.5",
-    "@procedures/shell": "0.33.0"
+    "@procedures/shell": "0.35.0"
   },
   "devDependencies": {
     "typescript": "^7.0.2",

package/src/argv.ts

@@ -1,48 +1,7 @@
 /**
  * The argv of a CLI command from a command path, named arguments and positional arguments. The
- * procedures start the program with argv, never through a shell.
+ * procedures start the program with argv, never through a shell. The helpers are the shared ones
+ * of `@procedures/shell/cli` (dedupe review F2): this file keeps the exports of this package.
  */
 
-export type ArgValue = string | number | boolean | readonly string[];
-
-/** A flag name: lowercase letters, digits and hyphens. */
-export const FLAG_NAME: RegExp = /^[a-z][a-z0-9-]*$/;
-
-/**
- * This function gives the argv: the path, then each named argument, then `--` and the positional
- * arguments. `true` gives `--key`, `false` gives nothing, a list gives `--key=value` for each
- * value, and another value gives `--key=value`.
- */
-export function buildArgv(input: {
-  readonly path: readonly string[];
-  readonly args?: Readonly<Record<string, ArgValue>> | undefined;
-  readonly positional?: readonly string[] | undefined;
-  readonly flags?: readonly string[] | undefined;
-}): string[] {
-  const argv = [...input.path, ...(input.flags ?? [])];
-  for (const [key, value] of Object.entries(input.args ?? {})) {
-    if (!FLAG_NAME.test(key)) throw new Error(`The argument name "${key}" is not a flag name (lowercase letters, digits, hyphens)`);
-    if (value === false) continue;
-    if (value === true) argv.push(`--${key}`);
-    else if (Array.isArray(value)) for (const item of value) argv.push(`--${key}=${item}`);
-    else argv.push(`--${key}=${String(value)}`);
-  }
-  if (input.positional && input.positional.length > 0) argv.push("--", ...input.positional);
-  return argv;
-}
-
-/** This function reads JSON output: one document, or one document on each line (NDJSON). */
-export function parseJsonOutput(stdout: string): unknown {
-  const text = stdout.trim();
-  if (text.length === 0) return undefined;
-  try {
-    return JSON.parse(text);
-  } catch {
-    const lines = text.split(/\r?\n/).filter((line) => line.trim().length > 0);
-    try {
-      return lines.map((line) => JSON.parse(line) as unknown);
-    } catch {
-      return undefined;
-    }
-  }
-}
+export { buildArgv, parseJsonOutput, FLAG_NAME, type ArgValue } from "@procedures/shell/cli";

package/src/module.ts

@@ -1,11 +1,13 @@
 /**
- * The procedures of @procedures/tailscale as data. Importing this file registers nothing.
+ * The procedures of @procedures/tailscale as data. Importing this file registers nothing. The
+ * module requires the module of `@procedures/shell`: `tailscale.run` calls `shell.run`.
  */
 
 import { defineModule, registerModules, PROCEDURE_REGISTRY, type ProcedureModule, type ProcedureRegistry } from "@procedures/client";
+import shellModule from "@procedures/shell/module";
 import { createTailscaleProcedures, tailscaleProcedures, type TailscaleProceduresOptions } from "./procedures.js";
 
-export const tailscaleModule: ProcedureModule = defineModule("@procedures/tailscale", tailscaleProcedures);
+export const tailscaleModule: ProcedureModule = defineModule("@procedures/tailscale", tailscaleProcedures, [shellModule]);
 
 export default tailscaleModule;
 
@@ -19,7 +21,7 @@ export default tailscaleModule;
  */
 export function createTailscaleModule(options: TailscaleProceduresOptions = {}): ProcedureModule {
   if (options.executable === undefined) return tailscaleModule;
-  return defineModule("@procedures/tailscale", createTailscaleProcedures(options));
+  return defineModule("@procedures/tailscale", createTailscaleProcedures(options), [shellModule]);
 }
 
 /**

package/src/procedures.ts

@@ -5,11 +5,15 @@
  * The program comes from the host, never from the input (audit pass 2, O55): the `executable`
  * option of `createTailscaleModule()`, then `TAILSCALE_EXE`, then the install folder, then
  * `tailscale`. Before, an input `executable` let the caller start any program.
+ *
+ * The procedure starts tailscale with argv through a nested `shell.run` call, the runner of
+ * `defineCliTool()` (tracker item O64). The engine applies its rules to that call, and a cancel
+ * stops the program.
  */
 
 import { existsSync } from "node:fs";
-import { createProcedure, zodAdapter, type AnyProcedure, type ProcedureContext } from "@procedures/client";
-import { runCommand } from "@procedures/shell/command";
+import { createProcedure, type AnyProcedure, type ProcedureContext } from "@procedures/client";
+import { defineCliTool } from "@procedures/shell/cli";
 import { z } from "zod";
 import { buildArgv, parseJsonOutput, type ArgValue } from "./argv.js";
 
@@ -61,6 +65,14 @@ const RunOutputSchema = z.object({
   actionUrl: z.string().optional(),
 });
 
+/**
+ * True when the output of `shell.run` tells that the program did not start. `shell.run` gives
+ * exit code 1 and the error of the start as the standard error, for example `spawn tailscale ENOENT`.
+ */
+function didNotStart(result: { exitCode: number; stdout: string; stderr: string }): boolean {
+  return result.exitCode === 1 && result.stdout === "" && /^spawn .+ E[A-Z0-9]+$/.test(result.stderr);
+}
+
 /** The settings of the host for the procedures of this package. The procedure input cannot change them. */
 export interface TailscaleProceduresOptions {
   /** The tailscale program. The default is `TAILSCALE_EXE`, then the Windows install folder, then `tailscale`. */
@@ -72,27 +84,29 @@ export interface TailscaleProceduresOptions {
  * of `tailscale.run` is `executable`, or the default of `tailscaleExecutable()` at each call.
  */
 export function createTailscaleProcedures(options: TailscaleProceduresOptions = {}): AnyProcedure[] {
+  const tailscale = defineCliTool({ name: "tailscale", resolve: () => tailscaleExecutable(options.executable) });
   const run = createProcedure()
     .path(["tailscale", "run"])
-    .input(zodAdapter<RunInput>(RunInputSchema))
-    .output(zodAdapter<RunOutput>(RunOutputSchema))
+    .input(RunInputSchema)
+    .output(RunOutputSchema)
     .meta({
       description: "Run a tailscale command (status, ip, serve, up, down)",
       args: ["path"],
       shorts: { timeout: "t" },
       output: "json",
+      calls: ["shell.run"],
       // up, down and serve change the network of the host. ssh starts a program on another host.
       effects: { reads: ["network"], writes: ["network", "process"], destructive: true },
     })
-    .handler(async (input: RunInput, ctx?: ProcedureContext): Promise<RunOutput> => {
+    .handler(async (input: RunInput, ctx: ProcedureContext): Promise<RunOutput> => {
       const argv = buildArgv({
         path: input.path,
         flags: input.json ? ["--json"] : [],
         args: input.args as Record<string, ArgValue> | undefined,
         positional: input.positional,
       });
-      const result = await runCommand(tailscaleExecutable(options.executable), { args: argv, timeout: input.timeout, signal: ctx?.signal });
-      if (result.error) throw new Error(`tailscale did not start: ${result.error}`);
+      const result = await tailscale.call(argv, { timeout: input.timeout }, ctx);
+      if (didNotStart(result)) throw new Error(`tailscale did not start: ${result.stderr}`);
       const json = input.json ? parseJsonOutput(result.stdout) : undefined;
       // tailscale prints an address to open when a login or a feature needs the owner
       const actionUrl = /https:\/\/login\.tailscale\.com\/\S+/.exec(`${result.stdout}\n${result.stderr}`)?.[0];
@@ -105,7 +119,7 @@ export function createTailscaleProcedures(options: TailscaleProceduresOptions =
         ...(actionUrl !== undefined ? { actionUrl } : {}),
       };
     })
-    .build() as AnyProcedure;
+    .build();
   return [run];
 }