@swirls/looms 0.0.2 → 0.2.0

package/dist/cli/commands.js

@@ -1,9 +1,10 @@
-import { Config, Console, Effect, FileSystem, Layer, Option, Path, Queue, Stdio, Stream, Terminal, } from 'effect';
+import { Config, Console, Effect, FileSystem, Layer, Option, Path, Queue, Schema, Stdio, Stream, Terminal, } from 'effect';
 import { Argument, CliError, Command, Flag } from 'effect/unstable/cli';
 import { ChildProcessSpawner } from 'effect/unstable/process';
 import { steer as steerEvent } from '@swirls/looms/agent';
 import { decision } from '@swirls/looms/approval';
 import { createLoomsClient } from '@swirls/looms/client';
+import { stringifyJson, stringifyJsonPretty } from '@swirls/looms/core';
 import { createLooms } from '@swirls/looms/runtime';
 const VERSION = '0.0.1';
 const urlFlag = Flag.string('url').pipe(Flag.withDescription('Looms host base URL (env LOOMS_URL)'), Flag.withFallbackConfig(Config.string('LOOMS_URL')), Flag.withDefault('http://127.0.0.1:8787'), Flag.map((url) => url.replace(/\/$/, '')));
@@ -11,13 +12,7 @@ function parseJsonArg(raw) {
     if (Option.isNone(raw) || raw.value === '') {
         return null;
     }
-    try {
-        // SAFETY: CLI JSON args decode to JsonValue; parse failures fall back to the raw string
-        return JSON.parse(raw.value);
-    }
-    catch {
-        return raw.value;
-    }
+    return Option.getOrElse(Schema.decodeOption(Schema.fromJsonString(Schema.Json))(raw.value), () => raw.value);
 }
 function clientFor(url) {
     return createLoomsClient({ baseUrl: url });
@@ -47,21 +42,21 @@ const start = Command.make('start', {
 }, Effect.fn('start')(function* ({ kind, name, json }) {
     const { url } = yield* loomsBase;
     const result = yield* tryClient(() => clientFor(url).startRun({ kind, definitionName: name, input: parseJsonArg(json) }));
-    yield* Console.log(JSON.stringify(result, null, 2));
+    yield* Console.log(stringifyJsonPretty(result));
 })).pipe(Command.withDescription('Start a run from a registered definition: looms start agent echo \'{"text":"hi"}\''), Command.withShortDescription('Start a run'));
 const events = Command.make('events', {
     runId: Argument.string('runId').pipe(Argument.withDescription('Run id')),
 }, Effect.fn('events')(function* ({ runId }) {
     const { url } = yield* loomsBase;
     const result = yield* tryClient(() => clientFor(url).getEvents(runId));
-    yield* Console.log(JSON.stringify(result, null, 2));
+    yield* Console.log(stringifyJsonPretty(result));
 })).pipe(Command.withDescription('List events for a run'), Command.withShortDescription('List run events'));
 const state = Command.make('state', {
     runId: Argument.string('runId').pipe(Argument.withDescription('Run id')),
 }, Effect.fn('state')(function* ({ runId }) {
     const { url } = yield* loomsBase;
     const result = yield* tryClient(() => clientFor(url).getRun(runId));
-    yield* Console.log(JSON.stringify(result, null, 2));
+    yield* Console.log(stringifyJsonPretty(result));
 })).pipe(Command.withDescription('Show run state'), Command.withShortDescription('Show run state'));
 const approve = Command.make('approve', {
     runId: Argument.string('runId').pipe(Argument.withDescription('Run id')),
@@ -78,7 +73,8 @@ const approve = Command.make('approve', {
     const outcome = accept ? 'approve' : 'reject';
     const { url } = yield* loomsBase;
     const result = yield* tryClient(() => clientFor(url).signal(runId, [decision(approvalId, outcome)]));
-    yield* Console.log(JSON.stringify(result, null, 2));
+    yield* Console.log(stringifyJsonPretty(result));
+    return undefined;
 })).pipe(Command.withDescription('Approve or reject a pending approval'), Command.withShortDescription('Decide an approval'));
 const replay = Command.make('replay', {
     runId: Argument.string('runId').pipe(Argument.withDescription('Run id')),
@@ -86,7 +82,7 @@ const replay = Command.make('replay', {
 }, Effect.fn('replay')(function* ({ runId, seq }) {
     const { url } = yield* loomsBase;
     const result = yield* tryClient(() => clientFor(url).replayTo(runId, seq));
-    yield* Console.log(JSON.stringify(result, null, 2));
+    yield* Console.log(stringifyJsonPretty(result));
 })).pipe(Command.withDescription('Replay a run to a sequence'), Command.withShortDescription('Replay to seq'));
 const signal = Command.make('signal', {
     runId: Argument.string('runId').pipe(Argument.withDescription('Run id')),
@@ -95,7 +91,7 @@ const signal = Command.make('signal', {
 }, Effect.fn('signal')(function* ({ runId, type, json }) {
     const { url } = yield* loomsBase;
     const result = yield* tryClient(() => clientFor(url).signal(runId, [{ type, payload: parseJsonArg(json) }]));
-    yield* Console.log(JSON.stringify(result, null, 2));
+    yield* Console.log(stringifyJsonPretty(result));
 })).pipe(Command.withDescription('Append an external event and wake the run'), Command.withShortDescription('Signal a run'));
 const steer = Command.make('steer', {
     runId: Argument.string('runId').pipe(Argument.withDescription('Run id')),
@@ -104,7 +100,7 @@ const steer = Command.make('steer', {
 }, Effect.fn('steer')(function* ({ runId, message, interrupt }) {
     const { url } = yield* loomsBase;
     const result = yield* tryClient(() => clientFor(url).signal(runId, [steerEvent(message.join(' '), { interrupt })]));
-    yield* Console.log(JSON.stringify(result, null, 2));
+    yield* Console.log(stringifyJsonPretty(result));
 })).pipe(Command.withDescription('Send a steering message to a running agent'), Command.withShortDescription('Steer an agent'));
 const tail = Command.make('tail', {
     runId: Argument.string('runId').pipe(Argument.withDescription('Run id')),
@@ -115,7 +111,7 @@ const tail = Command.make('tail', {
     yield* Effect.scoped(Effect.gen(function* () {
         const queue = yield* Queue.unbounded();
         yield* Effect.acquireRelease(Effect.sync(() => client.subscribeEvents(runId, (event) => {
-            Queue.offerUnsafe(queue, JSON.stringify(event));
+            Queue.offerUnsafe(queue, stringifyJson(event));
         })), (stop) => Effect.sync(() => stop()));
         yield* Stream.fromQueue(queue).pipe(Stream.runForEach((line) => Console.log(line)));
     }));