From d5d02e4199dada21873fda1e81c396a2903a005a Mon Sep 17 00:00:00 2001 From: tiye Date: Fri, 13 Nov 2026 22:54:39 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=B2=BE=E7=A1=AE=E6=A0=87=E6=B3=A8=20Term?= =?UTF-8?q?ina=20=E6=97=A5=E5=BF=97=E6=BB=9A=E5=8A=A8=E5=9B=9E=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- calcit.cirru | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/calcit.cirru b/calcit.cirru index 8d92d08..fd4bfd1 100644 --- a/calcit.cirru +++ b/calcit.cirru @@ -1605,7 +1605,10 @@ (:some raw-element) (element-scroll-to-bottom! raw-element) :examples $ [] :ffi $ {} (:backend :js) (:target :browser) - :schema $ quote $ Fn Dynamic Dynamic (-> Unit) (:features :js-ffi) + :schema $ quote $ Fn respo.schema/RespoEvent + Fn *dispatch-op $ -> Unit + -> Unit + :features :js-ffi :ns $ %{} 'NsEntry (:doc |) :code $ quote $ ns app.comp.process-detail :require From 2dbc2c74c79a96e8b1914c9687ffeaae2ab3d11f Mon Sep 17 00:00:00 2001 From: tiye Date: Fri, 13 Nov 2026 22:56:45 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=9C=A8=20Termina=20=E8=BF=9B=E7=A8=8B?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E4=B8=AD=E5=A4=8D=E7=94=A8=E5=85=B7=E5=90=8D?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E8=BD=BD=E8=8D=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- calcit.cirru | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/calcit.cirru b/calcit.cirru index fd4bfd1..0435485 100644 --- a/calcit.cirru +++ b/calcit.cirru @@ -2171,9 +2171,8 @@ hint-fn $ Fn (JsNullish Number) (JsNullish String) (-> Unit) js/console.warn |[EXIT] code signal dispatch! - app.schema/Op :process/error $ assert-type - [] pid $ str &newline $ if (js-nullish? code) (str "|signal: " signal) (str "|exit: " code) - Tuple Number String + app.schema/Op :process/error $ app.schema/LogEvent :pid pid :data $ str &newline + if (js-nullish? code) (str "|signal: " signal) (str "|exit: " code) , sid dispatch! (app.schema/Op :process/finish pid) sid swap! *registry dissoc pid @@ -2181,9 +2180,7 @@ .on-error! proc |error $ fn (event) hint-fn $ Fn JsObject $ -> Unit dispatch! - app.schema/Op :process/error $ assert-type - [] pid $ str-spaced |error: $ str event - Tuple Number String + app.schema/Op :process/error $ app.schema/LogEvent :pid pid :data $ str-spaced |error: (str event) , sid ; dispatch! (app.schema/Op :process/finish pid) sid js/console.error "|[TERMINA] process error" event @@ -2192,14 +2189,14 @@ .on (.-stdout proc) |data $ fn (data) hint-fn $ Fn String $ -> Unit dispatch! - app.schema/Op :process/stdout $ assert-type ([] pid data) (Tuple Number String) + app.schema/Op :process/stdout $ app.schema/LogEvent :pid pid :data data , sid , &unit .set-encoding! (.-stderr proc) |utf8 .on (.-stderr proc) |data $ fn (data) hint-fn $ Fn String $ -> Unit dispatch! - app.schema/Op :process/stderr $ assert-type ([] pid data) (Tuple Number String) + app.schema/Op :process/stderr $ app.schema/LogEvent :pid pid :data data , sid , &unit &unit :examples $ [] @@ -2354,12 +2351,12 @@ :process/clear :process/clear-history :process/create Dynamic - :process/error $ Tuple Number String + :process/error app.schema/LogEvent :process/finish Number :process/remove-dead Number :process/shorten-content Number - :process/stderr $ Tuple Number String - :process/stdout $ Tuple Number String + :process/stderr app.schema/LogEvent + :process/stdout app.schema/LogEvent :router/change Dynamic :session/add-message String :session/enlarge Number @@ -2504,13 +2501,19 @@ (:process/clear) (:: :process/clear nil) (:process/clear-history) (:: :process/clear-history nil) (:user/log-out) (:: :user/log-out nil) + (:process/error event) + :: :process/error $ [] (:pid event) (:data event) + (:process/stderr event) + :: :process/stderr $ [] (:pid event) (:data event) + (:process/stdout event) + :: :process/stdout $ [] (:pid event) (:data event) _ $ :: (&enum:nth op 0) & $ &enum:params op :examples $ [] :schema $ quote $ Fn Op (-> AnyEnum) (:open :reflect) :tests $ [] $ %{} 'TestEntry (:name |keeps-legacy-process-output-payload) :code $ quote $ assert= :: :process/stdout $ [] 42 |ready - op-to-wire $ Op :process/stdout $ assert-type ([] 42 |ready) (Tuple Number String) + op-to-wire $ Op :process/stdout $ LogEvent :pid 42 :data |ready 'page $ %{} 'CodeEntry (:doc |) :code $ quote $ def page {} (:id nil) (:title |) (:time nil) From 7ab46c9e94f95c1b2236eb5be513b7f7e8bd7d1f Mon Sep 17 00:00:00 2001 From: tiye Date: Fri, 13 Nov 2026 22:57:36 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=A6=86=E7=9B=96=20Termina=20=E4=B8=89?= =?UTF-8?q?=E7=B1=BB=E6=97=A5=E5=BF=97=E7=9A=84=E6=97=A7=E5=9B=9E=E6=94=BE?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- calcit.cirru | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/calcit.cirru b/calcit.cirru index 0435485..d73b6b4 100644 --- a/calcit.cirru +++ b/calcit.cirru @@ -2511,9 +2511,17 @@ :examples $ [] :schema $ quote $ Fn Op (-> AnyEnum) (:open :reflect) :tests $ [] $ %{} 'TestEntry (:name |keeps-legacy-process-output-payload) - :code $ quote $ assert= - :: :process/stdout $ [] 42 |ready - op-to-wire $ Op :process/stdout $ LogEvent :pid 42 :data |ready + :code $ quote $ let + event $ LogEvent :pid 42 :data "|日志🐈" + assert= + :: :process/stdout $ [] 42 "|日志🐈" + op-to-wire $ Op :process/stdout event + assert= + :: :process/stderr $ [] 42 "|日志🐈" + op-to-wire $ Op :process/stderr event + assert= + :: :process/error $ [] 42 "|日志🐈" + op-to-wire $ Op :process/error event 'page $ %{} 'CodeEntry (:doc |) :code $ quote $ def page {} (:id nil) (:title |) (:time nil) From e4b3015ea4291ef305957a038cbd6cdb8575ff39 Mon Sep 17 00:00:00 2001 From: tiye Date: Fri, 13 Nov 2026 23:07:48 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=80=9A=E8=BF=87=E5=8D=8F=E8=AE=AE?= =?UTF-8?q?=E7=BC=96=E7=A0=81=E9=AA=8C=E8=AF=81=20Termina=20=E8=BF=9B?= =?UTF-8?q?=E7=A8=8B=E8=BE=93=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/command-parser.test.mjs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/command-parser.test.mjs b/tests/command-parser.test.mjs index ef74332..9ebe19e 100644 --- a/tests/command-parser.test.mjs +++ b/tests/command-parser.test.mjs @@ -5,7 +5,7 @@ import { tmpdir } from "node:os"; import { join } from "node:path"; import * as c from "../js-out/calcit.core.mjs"; import { parse_command, read_string_field, read_bool_field_or, create_process_$x_, _$s_registry } from "../js-out/app.manager.mjs"; -import { database, encode_database } from "../js-out/app.schema.mjs"; +import { database, encode_database, op_to_wire } from "../js-out/app.schema.mjs"; import { updater } from "../js-out/app.updater.mjs"; test("only leading assignments are environment and values retain equals signs", () => { @@ -52,7 +52,7 @@ test("spawn and exec preserve synthetic stdout/stderr and completion", { timeout await new Promise(resolve => { create_process_$x_(data, (operation, sid) => { const kind = c._$n_enum_$o_nth(operation, 0).value; - events.push({ kind, payload: c._$n_enum_$o_nth(operation, 1), sid }); + events.push({ kind, payload: c._$n_enum_$o_nth(op_to_wire(operation), 1), sid }); if (["process/stdout", "process/stderr", "process/finish"].every(expected => events.some(event => event.kind === expected))) resolve(); return; }, "synthetic-session");