@camerontaylor/paseo-cli 0.8.0-fork.1 → 0.8.0-fork.3

package/dist/utils/command-options.d.ts

@@ -1,4 +1,5 @@
 import type { Command } from "commander";
+export declare function addLocalDaemonOptions<T extends Command>(command: T): T;
 export declare function collectMultiple(value: string, previous: string[]): string[];
 export declare function addJsonOption<T extends Command>(command: T): T;
 export declare function addDaemonHostOption<T extends Command>(command: T): T;

package/dist/utils/command-options.js

@@ -1,5 +1,12 @@
+import { selectDaemonTarget } from "./daemon-target.js";
 const JSON_OPTION_DESCRIPTION = "Output in JSON format";
-const DAEMON_HOST_OPTION_DESCRIPTION = "Daemon host target: host:port, tcp://host:port, or ssh://user@host (default: local socket/pipe, then localhost:6767)";
+const DAEMON_HOST_OPTION_DESCRIPTION = "Explicit daemon endpoint: host:port, TCP, socket, SSH, or pairing URL (default: local home)";
+const localCommands = new WeakSet();
+export function addLocalDaemonOptions(command) {
+    localCommands.add(command);
+    command.option("--home <path>", "Local daemon home (default: ~/.paseo)");
+    return command;
+}
 export function collectMultiple(value, previous) {
     return previous.concat([value]);
 }
@@ -9,6 +16,8 @@ export function addJsonOption(command) {
 }
 export function addDaemonHostOption(command) {
     command.option("--host <host>", DAEMON_HOST_OPTION_DESCRIPTION);
+    if (!command.options.some((option) => option.long === "--home"))
+        command.option("--home <path>", "Select a local daemon home (default: ~/.paseo)");
     return command;
 }
 export function addJsonAndDaemonHostOptions(command) {
@@ -18,7 +27,20 @@ export function withGlobalOptions(handler) {
     return (...args) => {
         const command = args.at(-1);
         const mergedArgs = [...args];
-        mergedArgs[mergedArgs.length - 2] = command.optsWithGlobals();
+        const options = command.optsWithGlobals();
+        const selectors = { home: new Set(), host: new Set() };
+        for (let current = command; current; current = current.parent) {
+            for (const key of ["home", "host"]) {
+                const value = current.opts()[key];
+                if (typeof value === "string")
+                    selectors[key].add(value);
+            }
+        }
+        if (selectors.home.size > 1 || selectors.host.size > 1)
+            throw { code: "TARGET_AMBIGUOUS", message: "Conflicting duplicate daemon selectors." };
+        const localOnly = localCommands.has(command);
+        options.daemonTarget = selectDaemonTarget(options, process.env, localOnly);
+        mergedArgs[mergedArgs.length - 2] = options;
         return handler(...mergedArgs);
     };
 }

package/dist/utils/daemon-target.d.ts

@@ -0,0 +1,13 @@
+export type DaemonTarget = {
+    kind: "instance";
+    home: string;
+} | {
+    kind: "endpoint";
+    host: string;
+};
+export declare function selectDaemonTarget(options: {
+    home?: string;
+    host?: string;
+}, env?: NodeJS.ProcessEnv, localOnly?: boolean): DaemonTarget;
+export declare function describeDaemonTarget(target: DaemonTarget): string;
+//# sourceMappingURL=daemon-target.d.ts.map

package/dist/utils/daemon-target.js

@@ -0,0 +1,51 @@
+import { resolvePaseoHome } from "@camerontaylor/paseo-server";
+export function selectDaemonTarget(options, env = process.env, localOnly = false) {
+    for (const key of ["home", "host"]) {
+        if (options[key] !== undefined && !options[key].trim())
+            throw { code: "TARGET_INVALID", message: `--${key} requires a non-empty value.` };
+    }
+    if (options.home !== undefined && options.host !== undefined)
+        throw { code: "TARGET_AMBIGUOUS", message: "Choose either --home or --host, not both." };
+    if (localOnly) {
+        if (options.host !== undefined)
+            throw {
+                code: "LOCAL_OPERATION",
+                message: "This is a local operation; use --home. --host is not supported.",
+            };
+        return {
+            kind: "instance",
+            home: resolvePaseoHome({ PASEO_HOME: options.home ?? env.PASEO_HOME }),
+        };
+    }
+    if (options.home !== undefined)
+        return { kind: "instance", home: resolvePaseoHome({ PASEO_HOME: options.home }) };
+    if (options.host !== undefined)
+        return { kind: "endpoint", host: options.host };
+    if (env.PASEO_HOME && env.PASEO_HOST)
+        throw {
+            code: "TARGET_AMBIGUOUS",
+            message: "PASEO_HOME and PASEO_HOST are both set. Choose --home or --host explicitly.",
+        };
+    if (env.PASEO_HOST)
+        return { kind: "endpoint", host: env.PASEO_HOST };
+    return { kind: "instance", home: resolvePaseoHome({ PASEO_HOME: env.PASEO_HOME }) };
+}
+export function describeDaemonTarget(target) {
+    if (target.kind === "instance")
+        return `home ${target.home}`;
+    try {
+        const url = new URL(target.host);
+        if (url.password)
+            url.password = "REDACTED";
+        for (const key of url.searchParams.keys())
+            if (/password|token|secret/i.test(key))
+                url.searchParams.set(key, "REDACTED");
+        if (url.hash)
+            url.hash = "REDACTED";
+        return url.toString();
+    }
+    catch {
+        return target.host.replace(/([?&](?:password|token|secret)=)[^&]*/gi, "$1REDACTED");
+    }
+}
+//# sourceMappingURL=daemon-target.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camerontaylor/paseo-cli",
-  "version": "0.8.0-fork.1",
+  "version": "0.8.0-fork.3",
   "description": "Paseo CLI - control your AI coding agents from the command line",
   "bin": {
     "paseo": "bin/paseo"
@@ -28,9 +28,9 @@
   },
   "dependencies": {
     "@clack/prompts": "^1.0.0",
-    "@camerontaylor/paseo-client": "0.8.0-fork.1",
-    "@camerontaylor/paseo-protocol": "0.8.0-fork.1",
-    "@camerontaylor/paseo-server": "0.8.0-fork.1",
+    "@camerontaylor/paseo-client": "0.8.0-fork.3",
+    "@camerontaylor/paseo-protocol": "0.8.0-fork.3",
+    "@camerontaylor/paseo-server": "0.8.0-fork.3",
     "chalk": "^5.3.0",
     "commander": "^12.0.0",
     "mime-types": "^2.1.35",
@@ -46,5 +46,9 @@
     "typescript": "^5.2.2",
     "vitest": "^4.1.6",
     "zx": "^8.8.5"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/camerontaylor/paseo"
   }
 }