@moltzap/client 2026.511.0 → 2026.518.0

package/dist/cli/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/cli/config.ts"],"names":[],"mappings":"AAGA,OAAO,EAAgC,MAAM,EAAU,MAAM,QAAQ,CAAC;AAEtE;;;;GAIG;AACH,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AASD,MAAM,MAAM,cAAc,GACtB,eAAe,GACf,gBAAgB,GAChB,kBAAkB,GAClB,sBAAsB,CAAC;;;;AAE3B,qBAAa,eAAgB,SAAQ,qBAAoC;IACvE,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACvB,CAAC;CAAG;;;;AAEL,qBAAa,gBAAiB,SAAQ,sBAAqC;IACzE,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACvB,CAAC;CAAG;;;;AAEL,qBAAa,kBAAmB,SAAQ,wBAAuC;IAC7E,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACvB,CAAC;CAAG;;;;AAEL,qBAAa,sBAAuB,SAAQ,4BAE1C;IACA,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B,CAAC;CAAG;AAeL,wBAAgB,aAAa,IAAI,MAAM,CAEtC;AAsDD;;;;;GAKG;AACH,eAAO,MAAM,UAAU,EAAE,MAAM,CAAC,MAAM,CACpC,aAAa,EACb,eAAe,GAAG,kBAAkB,CAoDpC,CAAC;AAEH,qFAAqF;AACrF,eAAO,MAAM,WAAW,GACtB,QAAQ,aAAa,KACpB,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,gBAAgB,CAoBnC,CAAC;AAEL,gCAAgC;AAChC,eAAO,MAAM,YAAY,GACvB,SAAS,CAAC,MAAM,EAAE,aAAa,KAAK,aAAa,KAChD,MAAM,CAAC,MAAM,CACd,IAAI,EACJ,kBAAkB,GAAG,eAAe,GAAG,gBAAgB,CAEoB,CAAC;AAE9E,8CAA8C;AAC9C,eAAO,MAAM,YAAY,EAAE,MAAM,CAAC,MAAM,CACtC,MAAM,EACN,kBAAkB,GAAG,eAAe,CACa,CAAC;AAEpD,2CAA2C;AAC3C,eAAO,MAAM,UAAU,EAAE,MAAM,CAAC,MAAM,CACpC,MAAM,EACN,kBAAkB,GAAG,eAAe,CAGrC,CAAC;AAEF,0EAA0E;AAC1E,eAAO,MAAM,WAAW,EAAE,MAAM,CAAC,MAAM,CACrC;IAAE,QAAQ,EAAE,MAAM,CAAA;CAAE,EACpB,sBAAsB,GAAG,kBAAkB,GAAG,eAAe,CAW9D,CAAC"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/cli/config.ts"],"names":[],"mappings":"AAEA,OAAO,EAIL,MAAM,EAIP,MAAM,QAAQ,CAAC;AAGhB;;;;GAIG;AACH,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAMD,MAAM,MAAM,cAAc,GACtB,eAAe,GACf,gBAAgB,GAChB,kBAAkB,GAClB,sBAAsB,CAAC;;;;AAE3B,qBAAa,eAAgB,SAAQ,qBAAoC;IACvE,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACvB,CAAC;CAAG;;;;AAEL,qBAAa,gBAAiB,SAAQ,sBAAqC;IACzE,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACvB,CAAC;CAAG;;;;AAEL,qBAAa,kBAAmB,SAAQ,wBAAuC;IAC7E,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACvB,CAAC;CAAG;;;;AAEL,qBAAa,sBAAuB,SAAQ,4BAE1C;IACA,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B,CAAC;CAAG;AA0BL,wBAAgB,aAAa,IAAI,MAAM,CAEtC;AAiJD;;;;;GAKG;AACH,eAAO,MAAM,UAAU,EAAE,MAAM,CAAC,MAAM,CACpC,aAAa,EACb,eAAe,GAAG,kBAAkB,CAOA,CAAC;AAqCvC,gCAAgC;AAChC,eAAO,MAAM,YAAY,GACvB,SAAS,CAAC,MAAM,EAAE,aAAa,KAAK,aAAa,KAChD,MAAM,CAAC,MAAM,CACd,IAAI,EACJ,kBAAkB,GAAG,eAAe,GAAG,gBAAgB,CAEoB,CAAC;AAE9E,8CAA8C;AAC9C,eAAO,MAAM,YAAY,EAAE,MAAM,CAAC,MAAM,CACtC,MAAM,EACN,kBAAkB,GAAG,eAAe,CACa,CAAC;AAEpD,2CAA2C;AAC3C,eAAO,MAAM,UAAU,EAAE,MAAM,CAAC,MAAM,CACpC,MAAM,EACN,kBAAkB,GAAG,eAAe,CAGrC,CAAC;AAEF,0EAA0E;AAC1E,eAAO,MAAM,WAAW,EAAE,MAAM,CAAC,MAAM,CACrC;IAAE,QAAQ,EAAE,MAAM,CAAA;CAAE,EACpB,sBAAsB,GAAG,kBAAkB,GAAG,eAAe,CAW9D,CAAC"}

package/dist/cli/config.js

@@ -1,9 +1,7 @@
-import * as fs from "node:fs";
-import * as path from "node:path";
-import * as os from "node:os";
-import { Config, ConfigProvider, Data, Effect, Option } from "effect";
-const CONFIG_DIR = path.join(os.homedir(), ".moltzap");
-const CONFIG_PATH = path.join(CONFIG_DIR, "config.json");
+import { FileSystem } from "@effect/platform";
+import { NodeFileSystem } from "@effect/platform-node";
+import { Config, ConfigProvider, Data, Effect, Either, Option, Redacted, } from "effect";
+import { getMoltZapConfigDir, getMoltZapConfigPath } from "../local-paths.js";
 const DEFAULT_SERVER_URL = "wss://api.moltzap.xyz";
 const CONFIG_FILE_MODE = 0o600;
 const JSON_INDENT_SPACES = 2;
@@ -18,111 +16,123 @@ export class AuthNotConfiguredError extends Data.TaggedError("AuthNotConfiguredE
 /** Effect.Config schema. Matches the on-disk JSON shape. */
 const ConfigSchema = Config.all({
     serverUrl: Config.string("serverUrl").pipe(Config.withDefault(DEFAULT_SERVER_URL)),
-    apiKey: Config.option(Config.string("apiKey")),
+    apiKey: Config.option(Config.redacted("apiKey")),
     agentName: Config.option(Config.string("agentName")),
 });
 const EnvOverrideSchema = Config.all({
-    apiKey: Config.option(Config.string("MOLTZAP_API_KEY")),
+    apiKey: Config.option(Config.redacted("MOLTZAP_API_KEY")),
     serverUrl: Config.option(Config.string("MOLTZAP_SERVER_URL")),
 });
 export function getConfigPath() {
-    return CONFIG_PATH;
+    return getMoltZapConfigPath();
 }
+const getConfigDir = getMoltZapConfigDir;
 const isRecord = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+function describeCause(cause) {
+    return cause instanceof Error ? cause.message : String(cause);
+}
+function configReadError(configPath, cause, detail) {
+    return new ConfigReadError({
+        cause,
+        message: `Failed to ${detail} ${configPath}: ${describeCause(cause)}`,
+        path: configPath,
+    });
+}
+const readConfigFileText = (configPath) => FileSystem.FileSystem.pipe(Effect.flatMap((fileSystem) => fileSystem
+    .exists(configPath)
+    .pipe(Effect.flatMap((exists) => exists
+    ? fileSystem.readFileString(configPath, "utf-8")
+    : Effect.succeed(null)))), Effect.provide(NodeFileSystem.layer), Effect.mapError((cause) => configReadError(configPath, cause, "read")));
+const parseConfigJson = (configPath, text) => Effect.try({
+    try: () => JSON.parse(text),
+    catch: (err) => configReadError(configPath, err, "parse"),
+});
+const requireConfigRecord = (configPath, parsed) => isRecord(parsed)
+    ? Effect.succeed(parsed)
+    : Effect.fail(new ConfigReadError({
+        cause: "config root is not a JSON object",
+        message: `Failed to parse ${configPath}: config root is not a JSON object`,
+        path: configPath,
+    }));
 /** Read the on-disk JSON (best-effort: ENOENT → empty object). */
 const readJsonFile = () => Effect.gen(function* () {
-    const text = yield* Effect.try({
-        try: () => fs.readFileSync(CONFIG_PATH, "utf-8"),
-        catch: (err) => err,
-    }).pipe(Effect.catchAll((err) => {
-        const code = err.code;
-        return code === "ENOENT"
-            ? Effect.succeed(null)
-            : Effect.fail(new ConfigReadError({
-                cause: err,
-                message: `Failed to read ${CONFIG_PATH}: ${err instanceof Error ? err.message : String(err)}`,
-                path: CONFIG_PATH,
-            }));
-    }));
+    const configPath = getConfigPath();
+    const text = yield* readConfigFileText(configPath);
     if (text === null)
         return {};
-    const parsed = yield* Effect.try({
-        try: () => JSON.parse(text),
-        catch: (err) => new ConfigReadError({
-            cause: err,
-            message: `Failed to parse ${CONFIG_PATH}: ${err instanceof Error ? err.message : String(err)}`,
-            path: CONFIG_PATH,
-        }),
-    });
-    if (!isRecord(parsed)) {
-        return yield* Effect.fail(new ConfigReadError({
-            cause: "config root is not a JSON object",
-            message: `Failed to parse ${CONFIG_PATH}: config root is not a JSON object`,
-            path: CONFIG_PATH,
-        }));
-    }
-    return parsed;
+    const parsed = yield* parseConfigJson(configPath, text);
+    return yield* requireConfigRecord(configPath, parsed);
 });
-/**
- * Load and validate the CLI config. Merges on-disk JSON with env overrides
- * (MOLTZAP_SERVER_URL, MOLTZAP_API_KEY) through a single `ConfigProvider`.
- * Missing file resolves with defaults; parse errors surface as typed
- * failures so callers see them instead of getting silent defaults.
- */
-export const loadConfig = Effect.gen(function* () {
-    const json = yield* readJsonFile();
+const readEnvOverrides = () => EnvOverrideSchema.pipe(Effect.withConfigProvider(ConfigProvider.fromEnv()), Effect.orElseSucceed(() => ({
+    apiKey: Option.none(),
+    serverUrl: Option.none(),
+})));
+function envRecordFromOverrides(overrides) {
     const env = {};
-    const envOverrides = yield* EnvOverrideSchema.pipe(Effect.withConfigProvider(ConfigProvider.fromEnv()), Effect.orElseSucceed(() => ({
-        apiKey: Option.none(),
-        serverUrl: Option.none(),
-    })));
-    Option.match(envOverrides.serverUrl, {
+    Option.match(overrides.serverUrl, {
         onNone: () => undefined,
         onSome: (value) => {
             env.serverUrl = value;
         },
     });
-    Option.match(envOverrides.apiKey, {
+    Option.match(overrides.apiKey, {
         onNone: () => undefined,
         onSome: (value) => {
-            env.apiKey = value;
+            env.apiKey = Redacted.value(value);
         },
     });
-    const provider = ConfigProvider.fromJson({ ...json, ...env });
-    const value = yield* ConfigSchema.pipe(Effect.withConfigProvider(provider), Effect.mapError((cause) => new ConfigInvalidError({
+    return env;
+}
+const decodeConfigValue = (configPath, provider) => ConfigSchema.pipe(Effect.withConfigProvider(provider), Effect.either, Effect.flatMap(Either.match({
+    onLeft: (cause) => Effect.fail(new ConfigInvalidError({
         cause,
-        message: `Invalid config in ${CONFIG_PATH}: ${cause}`,
-        path: CONFIG_PATH,
-    })));
+        message: `Invalid config in ${configPath}: ${cause}`,
+        path: configPath,
+    })),
+    onRight: (value) => Effect.succeed(value),
+})));
+function toMoltZapConfig(value) {
     const result = { serverUrl: value.serverUrl };
     Option.match(value.apiKey, {
         onNone: () => undefined,
-        onSome: (value) => {
-            result.apiKey = value;
+        onSome: (apiKey) => {
+            result.apiKey = Redacted.value(apiKey);
         },
     });
     Option.match(value.agentName, {
         onNone: () => undefined,
-        onSome: (value) => {
-            result.agentName = value;
+        onSome: (agentName) => {
+            result.agentName = agentName;
         },
     });
     return result;
-});
+}
+/**
+ * Load and validate the CLI config. Merges on-disk JSON with env overrides
+ * (MOLTZAP_SERVER_URL, MOLTZAP_API_KEY) through a single `ConfigProvider`.
+ * Missing file resolves with defaults; parse errors surface as typed
+ * failures so callers see them instead of getting silent defaults.
+ */
+export const loadConfig = Effect.gen(function* () {
+    const configPath = getConfigPath();
+    const json = yield* readJsonFile();
+    const env = envRecordFromOverrides(yield* readEnvOverrides());
+    const provider = ConfigProvider.fromJson({ ...json, ...env });
+    return toMoltZapConfig(yield* decodeConfigValue(configPath, provider));
+}).pipe(Effect.withSpan("loadConfig"));
 /** Write a new config blob to disk. Used by `moltzap register` post-registration. */
-export const writeConfig = (config) => Effect.try({
-    try: () => {
-        fs.mkdirSync(CONFIG_DIR, { recursive: true });
-        fs.writeFileSync(CONFIG_PATH, JSON.stringify(config, null, JSON_INDENT_SPACES) + "\n", {
-            mode: CONFIG_FILE_MODE,
-        });
-    },
-    catch: (err) => new ConfigWriteError({
-        cause: err,
-        message: `Failed to write ${CONFIG_PATH}: ${err instanceof Error ? err.message : String(err)}`,
-        path: CONFIG_PATH,
-    }),
-});
+const writeConfig = (config) => FileSystem.FileSystem.pipe(Effect.flatMap((fileSystem) => {
+    const configDir = getConfigDir();
+    const configPath = getConfigPath();
+    return fileSystem.makeDirectory(configDir, { recursive: true }).pipe(Effect.zipRight(fileSystem.writeFileString(configPath, JSON.stringify(config, null, JSON_INDENT_SPACES) + "\n", { mode: CONFIG_FILE_MODE })), Effect.either, Effect.flatMap(Either.match({
+        onLeft: (cause) => Effect.fail(new ConfigWriteError({
+            cause,
+            message: `Failed to write ${configPath}: ${cause.message}`,
+            path: configPath,
+        })),
+        onRight: (value) => Effect.succeed(value),
+    })));
+}), Effect.provide(NodeFileSystem.layer));
 /** Load-modify-write helper. */
 export const updateConfig = (updater) => loadConfig.pipe(Effect.flatMap((current) => writeConfig(updater(current))));
 /** WebSocket server URL (env-overridable). */

package/dist/cli/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/cli/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAatE,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,UAAU,CAAC,CAAC;AACvD,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;AAEzD,MAAM,kBAAkB,GAAG,uBAAuB,CAAC;AACnD,MAAM,gBAAgB,GAAG,KAAK,CAAC;AAC/B,MAAM,kBAAkB,GAAG,CAAC,CAAC;AAQ7B,MAAM,OAAO,eAAgB,SAAQ,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAIrE;CAAG;AAEL,MAAM,OAAO,gBAAiB,SAAQ,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAIvE;CAAG;AAEL,MAAM,OAAO,kBAAmB,SAAQ,IAAI,CAAC,WAAW,CAAC,oBAAoB,CAI3E;CAAG;AAEL,MAAM,OAAO,sBAAuB,SAAQ,IAAI,CAAC,WAAW,CAC1D,wBAAwB,CAGxB;CAAG;AAEL,4DAA4D;AAC5D,MAAM,YAAY,GAAG,MAAM,CAAC,GAAG,CAAC;IAC9B,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CACxC,MAAM,CAAC,WAAW,CAAC,kBAAkB,CAAC,CACvC;IACD,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC9C,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;CACrD,CAAC,CAAC;AACH,MAAM,iBAAiB,GAAG,MAAM,CAAC,GAAG,CAAC;IACnC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;IACvD,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;CAC9D,CAAC,CAAC;AAEH,MAAM,UAAU,aAAa;IAC3B,OAAO,WAAW,CAAC;AACrB,CAAC;AAED,MAAM,QAAQ,GAAG,CAAC,KAAc,EAAoC,EAAE,CACpE,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAEvE,kEAAkE;AAClE,MAAM,YAAY,GAAG,GAGnB,EAAE,CACF,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC;QAC7B,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,YAAY,CAAC,WAAW,EAAE,OAAO,CAAC;QAChD,KAAK,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG;KACpB,CAAC,CAAC,IAAI,CACL,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,EAAE,EAAE;QACtB,MAAM,IAAI,GAAI,GAA6B,CAAC,IAAI,CAAC;QACjD,OAAO,IAAI,KAAK,QAAQ;YACtB,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;YACtB,CAAC,CAAC,MAAM,CAAC,IAAI,CACT,IAAI,eAAe,CAAC;gBAClB,KAAK,EAAE,GAAG;gBACV,OAAO,EAAE,kBAAkB,WAAW,KACpC,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CACjD,EAAE;gBACF,IAAI,EAAE,WAAW;aAClB,CAAC,CACH,CAAC;IACR,CAAC,CAAC,CACH,CAAC;IACF,IAAI,IAAI,KAAK,IAAI;QAAE,OAAO,EAAE,CAAC;IAC7B,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC;QAC/B,GAAG,EAAE,GAAY,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;QACpC,KAAK,EAAE,CAAC,GAAG,EAAE,EAAE,CACb,IAAI,eAAe,CAAC;YAClB,KAAK,EAAE,GAAG;YACV,OAAO,EAAE,mBAAmB,WAAW,KACrC,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CACjD,EAAE;YACF,IAAI,EAAE,WAAW;SAClB,CAAC;KACL,CAAC,CAAC;IACH,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;QACtB,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CACvB,IAAI,eAAe,CAAC;YAClB,KAAK,EAAE,kCAAkC;YACzC,OAAO,EAAE,mBAAmB,WAAW,oCAAoC;YAC3E,IAAI,EAAE,WAAW;SAClB,CAAC,CACH,CAAC;IACJ,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC,CAAC;AAEL;;;;;GAKG;AACH,MAAM,CAAC,MAAM,UAAU,GAGnB,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IACtB,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,YAAY,EAAE,CAAC;IAEnC,MAAM,GAAG,GAA2B,EAAE,CAAC;IACvC,MAAM,YAAY,GAAG,KAAK,CAAC,CAAC,iBAAiB,CAAC,IAAI,CAChD,MAAM,CAAC,kBAAkB,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,EACnD,MAAM,CAAC,aAAa,CAAC,GAAG,EAAE,CAAC,CAAC;QAC1B,MAAM,EAAE,MAAM,CAAC,IAAI,EAAU;QAC7B,SAAS,EAAE,MAAM,CAAC,IAAI,EAAU;KACjC,CAAC,CAAC,CACJ,CAAC;IACF,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,SAAS,EAAE;QACnC,MAAM,EAAE,GAAG,EAAE,CAAC,SAAS;QACvB,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE;YAChB,GAAG,CAAC,SAAS,GAAG,KAAK,CAAC;QACxB,CAAC;KACF,CAAC,CAAC;IACH,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,EAAE;QAChC,MAAM,EAAE,GAAG,EAAE,CAAC,SAAS;QACvB,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE;YAChB,GAAG,CAAC,MAAM,GAAG,KAAK,CAAC;QACrB,CAAC;KACF,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAG,cAAc,CAAC,QAAQ,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,GAAG,EAAE,CAAC,CAAC;IAC9D,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,YAAY,CAAC,IAAI,CACpC,MAAM,CAAC,kBAAkB,CAAC,QAAQ,CAAC,EACnC,MAAM,CAAC,QAAQ,CACb,CAAC,KAAK,EAAE,EAAE,CACR,IAAI,kBAAkB,CAAC;QACrB,KAAK;QACL,OAAO,EAAE,qBAAqB,WAAW,KAAK,KAAK,EAAE;QACrD,IAAI,EAAE,WAAW;KAClB,CAAC,CACL,CACF,CAAC;IAEF,MAAM,MAAM,GAAkB,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,CAAC;IAC7D,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE;QACzB,MAAM,EAAE,GAAG,EAAE,CAAC,SAAS;QACvB,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE;YAChB,MAAM,CAAC,MAAM,GAAG,KAAK,CAAC;QACxB,CAAC;KACF,CAAC,CAAC;IACH,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,EAAE;QAC5B,MAAM,EAAE,GAAG,EAAE,CAAC,SAAS;QACvB,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE;YAChB,MAAM,CAAC,SAAS,GAAG,KAAK,CAAC;QAC3B,CAAC;KACF,CAAC,CAAC;IACH,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC,CAAC;AAEH,qFAAqF;AACrF,MAAM,CAAC,MAAM,WAAW,GAAG,CACzB,MAAqB,EACkB,EAAE,CACzC,MAAM,CAAC,GAAG,CAAC;IACT,GAAG,EAAE,GAAG,EAAE;QACR,EAAE,CAAC,SAAS,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC9C,EAAE,CAAC,aAAa,CACd,WAAW,EACX,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,kBAAkB,CAAC,GAAG,IAAI,EACvD;YACE,IAAI,EAAE,gBAAgB;SACvB,CACF,CAAC;IACJ,CAAC;IACD,KAAK,EAAE,CAAC,GAAG,EAAE,EAAE,CACb,IAAI,gBAAgB,CAAC;QACnB,KAAK,EAAE,GAAG;QACV,OAAO,EAAE,mBAAmB,WAAW,KACrC,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CACjD,EAAE;QACF,IAAI,EAAE,WAAW;KAClB,CAAC;CACL,CAAC,CAAC;AAEL,gCAAgC;AAChC,MAAM,CAAC,MAAM,YAAY,GAAG,CAC1B,OAAiD,EAIjD,EAAE,CACF,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;AAE9E,8CAA8C;AAC9C,MAAM,CAAC,MAAM,YAAY,GAGrB,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;AAEpD,2CAA2C;AAC3C,MAAM,CAAC,MAAM,UAAU,GAGnB,YAAY,CAAC,IAAI,CACnB,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAC7E,CAAC;AAEF,0EAA0E;AAC1E,MAAM,CAAC,MAAM,WAAW,GAGpB,UAAU,CAAC,IAAI,CACjB,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CACxB,MAAM,CAAC,MAAM;IACX,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;IAC7C,CAAC,CAAC,MAAM,CAAC,IAAI,CACT,IAAI,sBAAsB,CAAC;QACzB,OAAO,EAAE,oDAAoD;KAC9D,CAAC,CACH,CACN,CACF,CAAC"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/cli/config.ts"],"names":[],"mappings":"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"}

package/dist/cli/config.test.js

@@ -1,51 +1,89 @@
-import * as fs from "node:fs";
-import { Effect } from "effect";
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-vi.mock("node:fs");
+import { FileSystem, Path } from "@effect/platform";
+import { NodeContext } from "@effect/platform-node";
+import { it as effectIt } from "@effect/vitest";
+import { Effect, Exit } from "effect";
+import * as fc from "fast-check";
+import { afterEach, beforeEach, describe, expect, vi } from "vitest";
 import { resolveAuth } from "./config.js";
-function mockConfigFile(config) {
-    vi.mocked(fs.readFileSync).mockReturnValue(JSON.stringify(config));
+const it = effectIt.scoped;
+const CONFIG_FILE_NAME = "config.json";
+const CONFIG_HOME_PREFIX = "moltzap-client-";
+const ENV_AGENT_KEY = "moltzap_agent_envkey123";
+const CONFIG_AGENT_KEY = "moltzap_agent_configkey";
+const TEST_SERVER_URL = "wss://test";
+const TEST_AGENT_NAME = "myagent";
+const MISSING_REGISTRATION_MESSAGE = "No agent registered";
+const apiKeyArbitrary = fc.stringMatching(/^moltzap_agent_[a-z0-9]{1,16}$/);
+const authConfig = (apiKey) => ({
+    serverUrl: TEST_SERVER_URL,
+    apiKey,
+    agentName: TEST_AGENT_NAME,
+});
+const makeConfigHome = Effect.gen(function* () {
+    const fileSystem = yield* FileSystem.FileSystem;
+    const configHome = yield* fileSystem.makeTempDirectoryScoped({
+        prefix: CONFIG_HOME_PREFIX,
+    });
+    vi.stubEnv("MOLTZAP_CONFIG_HOME", configHome);
+    return configHome;
+});
+const writeConfigFile = (config) => Effect.gen(function* () {
+    const fileSystem = yield* FileSystem.FileSystem;
+    const path = yield* Path.Path;
+    const configHome = yield* makeConfigHome;
+    yield* fileSystem.writeFileString(path.join(configHome, CONFIG_FILE_NAME), JSON.stringify(config));
+});
+const withNodeContext = (effect) => effect.pipe(Effect.provide(NodeContext.layer));
+function expectAuthConfigPreservesKey(apiKey) {
+    expect(authConfig(apiKey).apiKey).toBe(apiKey);
+}
+function authConfigPreservesGeneratedKeys() {
+    return Effect.sync(() => {
+        fc.assert(fc.property(apiKeyArbitrary, expectAuthConfigPreservesKey));
+    });
+}
+function envApiKeyTakesPriority() {
+    return withNodeContext(Effect.gen(function* () {
+        vi.stubEnv("MOLTZAP_API_KEY", ENV_AGENT_KEY);
+        yield* writeConfigFile(authConfig(CONFIG_AGENT_KEY));
+        const result = yield* resolveAuth;
+        expect(result).toEqual({ agentKey: ENV_AGENT_KEY });
+    }));
+}
+function configApiKeyIsUsed() {
+    return withNodeContext(Effect.gen(function* () {
+        yield* writeConfigFile(authConfig(CONFIG_AGENT_KEY));
+        const result = yield* resolveAuth;
+        expect(result).toEqual({ agentKey: CONFIG_AGENT_KEY });
+    }));
+}
+function missingConfigApiKeyFails() {
+    return withNodeContext(Effect.gen(function* () {
+        yield* writeConfigFile({ serverUrl: TEST_SERVER_URL });
+        const exit = yield* Effect.exit(resolveAuth);
+        expect(Exit.isFailure(exit)).toBe(true);
+        expect(String(exit)).toContain(MISSING_REGISTRATION_MESSAGE);
+    }));
+}
+function missingConfigFileFails() {
+    return withNodeContext(Effect.gen(function* () {
+        yield* makeConfigHome;
+        const exit = yield* Effect.exit(resolveAuth);
+        expect(Exit.isFailure(exit)).toBe(true);
+        expect(String(exit)).toContain(MISSING_REGISTRATION_MESSAGE);
+    }));
 }
 describe("resolveAuth", () => {
-    const originalEnv = process.env;
     beforeEach(() => {
-        process.env = { ...originalEnv };
-        delete process.env.MOLTZAP_API_KEY;
-        delete process.env.MOLTZAP_SERVER_URL;
-        vi.mocked(fs.readFileSync).mockImplementation(() => {
-            throw Object.assign(new Error("ENOENT"), { code: "ENOENT" });
-        });
+        vi.unstubAllEnvs();
     });
     afterEach(() => {
-        process.env = originalEnv;
-        vi.restoreAllMocks();
-    });
-    it("MOLTZAP_API_KEY env var takes highest priority", async () => {
-        process.env.MOLTZAP_API_KEY = "moltzap_agent_envkey123";
-        mockConfigFile({
-            serverUrl: "wss://test",
-            apiKey: "moltzap_agent_configkey",
-            agentName: "myagent",
-        });
-        const result = await Effect.runPromise(resolveAuth);
-        expect(result).toEqual({ agentKey: "moltzap_agent_envkey123" });
-    });
-    it("config apiKey is used when no env var", async () => {
-        mockConfigFile({
-            serverUrl: "wss://test",
-            apiKey: "moltzap_agent_configkey",
-            agentName: "myagent",
-        });
-        const result = await Effect.runPromise(resolveAuth);
-        expect(result).toEqual({ agentKey: "moltzap_agent_configkey" });
-    });
-    it("fails if no env var and no config apiKey", async () => {
-        mockConfigFile({ serverUrl: "wss://test" });
-        await expect(Effect.runPromise(resolveAuth)).rejects.toThrow("No agent registered");
-    });
-    it("fails if config file missing", async () => {
-        // readFileSync throws ENOENT (set in beforeEach)
-        await expect(Effect.runPromise(resolveAuth)).rejects.toThrow("No agent registered");
+        vi.unstubAllEnvs();
     });
+    it("auth config fixture preserves generated api keys", authConfigPreservesGeneratedKeys);
+    it("MOLTZAP_API_KEY env var takes highest priority", envApiKeyTakesPriority);
+    it("config apiKey is used when no env var", configApiKeyIsUsed);
+    it("fails if no env var and no config apiKey", missingConfigApiKeyFails);
+    it("fails if config file missing", missingConfigFileFails);
 });
 //# sourceMappingURL=config.test.js.map

package/dist/cli/config.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.test.js","sourceRoot":"","sources":["../../src/cli/config.test.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAEzE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;AAEnB,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C,SAAS,cAAc,CAAC,MAAc;IACpC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;AACrE,CAAC;AAED,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IAC3B,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC;IAEhC,UAAU,CAAC,GAAG,EAAE;QACd,OAAO,CAAC,GAAG,GAAG,EAAE,GAAG,WAAW,EAAE,CAAC;QACjC,OAAO,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;QACnC,OAAO,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC;QACtC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,kBAAkB,CAAC,GAAG,EAAE;YACjD,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC/D,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,OAAO,CAAC,GAAG,GAAG,WAAW,CAAC;QAC1B,EAAE,CAAC,eAAe,EAAE,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gDAAgD,EAAE,KAAK,IAAI,EAAE;QAC9D,OAAO,CAAC,GAAG,CAAC,eAAe,GAAG,yBAAyB,CAAC;QACxD,cAAc,CAAC;YACb,SAAS,EAAE,YAAY;YACvB,MAAM,EAAE,yBAAyB;YACjC,SAAS,EAAE,SAAS;SACrB,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;QACpD,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,yBAAyB,EAAE,CAAC,CAAC;IAClE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uCAAuC,EAAE,KAAK,IAAI,EAAE;QACrD,cAAc,CAAC;YACb,SAAS,EAAE,YAAY;YACvB,MAAM,EAAE,yBAAyB;YACjC,SAAS,EAAE,SAAS;SACrB,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;QACpD,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,yBAAyB,EAAE,CAAC,CAAC;IAClE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0CAA0C,EAAE,KAAK,IAAI,EAAE;QACxD,cAAc,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,CAAC,CAAC;QAE5C,MAAM,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAC1D,qBAAqB,CACtB,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8BAA8B,EAAE,KAAK,IAAI,EAAE;QAC5C,iDAAiD;QACjD,MAAM,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAC1D,qBAAqB,CACtB,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"config.test.js","sourceRoot":"","sources":["../../src/cli/config.test.ts"],"names":[],"mappings":"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"}

package/dist/cli/index.d.ts

@@ -1,18 +1,3 @@
 #!/usr/bin/env node
-/**
- * Pull `--as <key>` and `--profile <name>` out of argv before handing the
- * remainder to `@effect/cli`. These are semantically global flags that
- * shape the transport layer for the whole invocation (spec sbd#177 rev 3
- * §5.1, §5.2, Invariant §4.2). Pre-parsing keeps the @effect/cli subcommand
- * tree clean of duplicated global options and guarantees `--as` can short-
- * circuit config-read side effects (architect design doc rev 4 finding 1).
- *
- * Accepts both `--as KEY` / `--as=KEY` forms; unknown flags pass through
- * to @effect/cli unchanged.
- */
-export declare const extractGlobalFlags: (argv: ReadonlyArray<string>) => {
-    impersonateKey?: string;
-    profileName?: string;
-    rest: Array<string>;
-};
+export {};
 //# sourceMappingURL=index.d.ts.map

package/dist/cli/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":";AAmCA;;;;;;;;;;GAUG;AACH,eAAO,MAAM,kBAAkB,GAC7B,MAAM,aAAa,CAAC,MAAM,CAAC,KAC1B;IACD,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;CAqDrB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":""}

package/dist/cli/index.js

@@ -1,8 +1,9 @@
 #!/usr/bin/env node
-import { createRequire } from "node:module";
-import { Command } from "@effect/cli";
+/** @file MoltZap CLI entrypoint and global transport option wiring. */
+import { Command, Options } from "@effect/cli";
 import { NodeContext, NodeRuntime } from "@effect/platform-node";
-import { Effect, Logger } from "effect";
+import { Effect, Layer, Logger, Option } from "effect";
+import packageJson from "../../package.json" with { type: "json" };
 import { agentsCommand } from "./commands/agents.js";
 import { contactsCommand } from "./commands/contacts.js";
 import { conversationsCommand, historyCommand, } from "./commands/conversations.js";
@@ -17,79 +18,58 @@ import { whoamiCommand } from "./commands/whoami.js";
 import { LoggerLive, minLogLevel } from "./runtime.js";
 import { makeTransportLayer, resolveTransportInputs, TransportConfigError, } from "./transport.js";
 import { ProfileConfigReadError, ProfileInvalidNameError, ProfileNotFoundError, } from "./profile.js";
-const require = createRequire(import.meta.url);
-const { version } = require("../../package.json");
-/**
- * Pull `--as <key>` and `--profile <name>` out of argv before handing the
- * remainder to `@effect/cli`. These are semantically global flags that
- * shape the transport layer for the whole invocation (spec sbd#177 rev 3
- * §5.1, §5.2, Invariant §4.2). Pre-parsing keeps the @effect/cli subcommand
- * tree clean of duplicated global options and guarantees `--as` can short-
- * circuit config-read side effects (architect design doc rev 4 finding 1).
- *
- * Accepts both `--as KEY` / `--as=KEY` forms; unknown flags pass through
- * to @effect/cli unchanged.
- */
-export const extractGlobalFlags = (argv) => {
-    // register parses --profile locally (spec §5.2: it writes a NEW profile).
-    // Intercepting at global scope would make the transport-resolver treat a
-    // not-yet-created profile as a lookup failure. Route --profile to register
-    // when register is the invoked subcommand; route globally otherwise.
-    const isRegister = argv.some((t, i) => t === "register" &&
-        argv.slice(0, i).every((prev) => !prev.startsWith("-")));
-    const rest = [];
-    let impersonateKey;
-    let profileName;
-    for (let i = 0; i < argv.length; i++) {
-        const token = argv[i];
-        if (token === "--as") {
-            const next = argv[i + 1];
-            if (next !== undefined) {
-                impersonateKey = next;
-                i++;
-            }
-            continue;
-        }
-        if (token.startsWith("--as=")) {
-            impersonateKey = token.slice("--as=".length);
-            continue;
-        }
-        if (!isRegister) {
-            if (token === "--profile") {
-                const next = argv[i + 1];
-                if (next !== undefined) {
-                    profileName = next;
-                    i++;
-                }
-                continue;
-            }
-            if (token.startsWith("--profile=")) {
-                profileName = token.slice("--profile=".length);
-                continue;
-            }
-        }
-        rest.push(token);
+import { currentArgv } from "./process-argv.js";
+const { version } = packageJson;
+const asOption = Options.text("as").pipe(Options.withDescription("Dial the server as the agent owning this API key, bypassing the local daemon."), Options.optional);
+const globalProfileOption = Options.text("profile").pipe(Options.withDescription("Load an existing named profile from ~/.moltzap/config.json for this invocation."), Options.optional);
+function resolverInputFromConfig(config) {
+    const impersonateKey = Option.getOrUndefined(config.as);
+    const profileName = Option.getOrUndefined(config.profile);
+    return {
+        ...(impersonateKey !== undefined ? { impersonateKey } : {}),
+        ...(profileName !== undefined ? { profileName } : {}),
+    };
+}
+function exitWithCliError(message) {
+    console.error(`moltzap: ${message}`);
+    process.exit(1);
+}
+function transportResolutionMessage(err) {
+    if (err instanceof ProfileNotFoundError) {
+        return `profile not found: ${err.name}`;
+    }
+    if (err instanceof ProfileInvalidNameError) {
+        return `invalid profile name "${err.name}": ${err.reason}`;
     }
-    const out = { rest };
-    if (impersonateKey !== undefined)
-        out.impersonateKey = impersonateKey;
-    if (profileName !== undefined)
-        out.profileName = profileName;
-    return out;
-};
+    if (err instanceof ProfileConfigReadError) {
+        const cause = err.cause instanceof Error ? err.cause.message : String(err.cause);
+        return `config read error at ${err.path}: ${cause}`;
+    }
+    if (err instanceof TransportConfigError) {
+        return `transport config: ${err.reason}`;
+    }
+    return err instanceof Error ? err.message : String(err);
+}
+function resolveTransportOptionsOrExit(input) {
+    return resolveTransportInputs(input).pipe(Effect.catchAll((err) => Effect.sync(() => exitWithCliError(transportResolutionMessage(err)))));
+}
+const transportLayerFromConfig = (config) => Layer.unwrapEffect(resolveTransportOptionsOrExit(resolverInputFromConfig(config)).pipe(Effect.map(makeTransportLayer)));
 /**
  * Top-level `moltzap` command. Subcommands are `@effect/cli` `Command`s —
  * each handler returns an Effect. The single `NodeRuntime.runMain` below is
  * the ONLY bridge from the Effect graph to Node; no per-command runPromise.
  *
- * Global flags (`--as`, `--profile`) are pre-parsed from argv in
- * `extractGlobalFlags` above and provided to subcommand handlers via the
- * `Transport` Layer (see `transport.ts`).
+ * Parent options (`--as`, `--profile`) are parsed by `@effect/cli` and
+ * provided to subcommand handlers via the `Transport` Layer (see
+ * `transport.ts`).
  */
-const moltzap = Command.make("moltzap").pipe(Command.withDescription("MoltZap CLI — messaging for OpenClaw AI agents.\n" +
+const moltzapBase = Command.make("moltzap", {
+    as: asOption,
+    profile: globalProfileOption,
+}).pipe(Command.withDescription("MoltZap CLI — messaging for OpenClaw AI agents.\n" +
     "\n" +
-    "Global flags (pre-parsed by the CLI before @effect/cli sees argv; " +
-    "shared across every subcommand):\n" +
+    "Global flags (parsed by @effect/cli before the selected subcommand " +
+    "runs):\n" +
     "  --as <apiKey>     Dial the server as the agent owning the given " +
     "API key, bypassing the local daemon. Useful for multi-agent hosts " +
     "where one operator drives multiple registered agents.\n" +
@@ -118,50 +98,7 @@ const moltzap = Command.make("moltzap").pipe(Command.withDescription("MoltZap CL
     // sbd#177 v2 additions:
     messagesCommand,
 ]));
+const moltzap = Command.provide(moltzapBase, (config) => transportLayerFromConfig(config));
 const cli = Command.run(moltzap, { name: "moltzap", version });
-const NODE_ARGV_USER_ARGS_OFFSET = 2;
-const { impersonateKey, profileName, rest } = extractGlobalFlags(process.argv.slice(NODE_ARGV_USER_ARGS_OFFSET));
-const resolverInput = {};
-if (impersonateKey !== undefined)
-    resolverInput.impersonateKey = impersonateKey;
-if (profileName !== undefined)
-    resolverInput.profileName = profileName;
-// Resolve transport inputs eagerly. On failure exit with a user-readable
-// message before touching @effect/cli; the CLI parser never sees a broken
-// transport config.
-const transportOptions = (() => {
-    const exit1 = (msg) => {
-        console.error(`moltzap: ${msg}`);
-        process.exit(1);
-    };
-    try {
-        return Effect.runSync(resolveTransportInputs(resolverInput));
-    }
-    catch (err) {
-        if (err instanceof ProfileNotFoundError) {
-            return exit1(`profile not found: ${err.name}`);
-        }
-        if (err instanceof ProfileInvalidNameError) {
-            return exit1(`invalid profile name "${err.name}": ${err.reason}`);
-        }
-        if (err instanceof ProfileConfigReadError) {
-            const cause = err.cause instanceof Error ? err.cause.message : String(err.cause);
-            return exit1(`config read error at ${err.path}: ${cause}`);
-        }
-        if (err instanceof TransportConfigError) {
-            return exit1(`transport config: ${err.reason}`);
-        }
-        const msg = err instanceof Error ? err.message : String(err);
-        return exit1(msg);
-    }
-})();
-const TransportLive = makeTransportLayer(transportOptions);
-// Re-assemble argv so @effect/cli sees the same process-shape it expects
-// (Command.run slices off the first two tokens).
-const argvForCli = [
-    process.argv[0] ?? "node",
-    process.argv[1] ?? "moltzap",
-    ...rest,
-];
-cli(argvForCli).pipe(Effect.provide(TransportLive), Effect.provide(NodeContext.layer), Effect.provide(LoggerLive), Logger.withMinimumLogLevel(minLogLevel), NodeRuntime.runMain);
+cli(currentArgv()).pipe(Effect.provide(NodeContext.layer), Effect.provide(LoggerLive), Logger.withMinimumLogLevel(minLogLevel), NodeRuntime.runMain);
 //# sourceMappingURL=index.js.map