cnagent 2.2.10 → 2.2.11

package/tools/dist/cn.js

@@ -12705,15 +12705,15 @@ var require_cn_lib = __commonJS({
       }
       ;
     }
-    function get_flag(key, flags) {
+    function get_flag(key, flags2) {
       return Stdlib__List2.find_map((function(param) {
         if (Caml_obj.caml_equal(param[0], key)) {
           return Caml_option2.some(param[1]);
         }
-      }), flags);
+      }), flags2);
     }
     function parse_out_cmd(args2) {
-      const flags = parse_flags_from_args(
+      const flags2 = parse_flags_from_args(
         /* [] */
         0,
         args2
@@ -12731,7 +12731,7 @@ var require_cn_lib = __commonJS({
               ),
               reason: r
             };
-          }), get_flag("reason", flags));
+          }), get_flag("reason", flags2));
         case "delegate":
           return Stdlib__Option2.map((function(t) {
             return {
@@ -12741,7 +12741,7 @@ var require_cn_lib = __commonJS({
               ),
               to_: t
             };
-          }), get_flag("to", flags));
+          }), get_flag("to", flags2));
         case "delete":
           return Stdlib__Option2.map((function(r) {
             return {
@@ -12751,7 +12751,7 @@ var require_cn_lib = __commonJS({
               ),
               reason: r
             };
-          }), get_flag("reason", flags));
+          }), get_flag("reason", flags2));
         case "do":
           const match2 = args2.tl;
           if (!match2) {
@@ -12773,9 +12773,9 @@ var require_cn_lib = __commonJS({
                     artifact: a
                   }
                 };
-              }), get_flag("artifact", flags));
+              }), get_flag("artifact", flags2));
             case "noop":
-              const r = get_flag("reason", flags);
+              const r = get_flag("reason", flags2);
               if (r === void 0) {
                 return;
               }
@@ -12836,10 +12836,10 @@ var require_cn_lib = __commonJS({
                     message: m
                   }
                 };
-              }), get_flag("message", flags));
+              }), get_flag("message", flags2));
             case "send":
-              const match$1 = get_flag("to", flags);
-              const match$2 = get_flag("message", flags);
+              const match$1 = get_flag("to", flags2);
+              const match$2 = get_flag("message", flags2);
               if (match$1 !== void 0 && match$2 !== void 0) {
                 return {
                   TAG: (
@@ -12873,7 +12873,7 @@ var require_cn_lib = __commonJS({
                     desc: d
                   }
                 };
-              }), get_flag("desc", flags));
+              }), get_flag("desc", flags2));
             default:
               return;
           }
@@ -13239,10 +13239,10 @@ var require_cn_lib = __commonJS({
       while (true) {
         const param = _param;
         const remaining = _remaining;
-        const flags = _flags;
+        const flags2 = _flags;
         if (!param) {
           return [
-            flags,
+            flags2,
             Stdlib__List2.rev(remaining)
           ];
         }
@@ -13252,9 +13252,9 @@ var require_cn_lib = __commonJS({
           case "--dry-run":
             _param = param.tl;
             _flags = {
-              json: flags.json,
-              quiet: flags.quiet,
-              verbose: flags.verbose,
+              json: flags2.json,
+              quiet: flags2.quiet,
+              verbose: flags2.verbose,
               dry_run: true
             };
             continue;
@@ -13262,9 +13262,9 @@ var require_cn_lib = __commonJS({
             _param = param.tl;
             _flags = {
               json: true,
-              quiet: flags.quiet,
-              verbose: flags.verbose,
-              dry_run: flags.dry_run
+              quiet: flags2.quiet,
+              verbose: flags2.verbose,
+              dry_run: flags2.dry_run
             };
             continue;
           case "--quiet":
@@ -13287,19 +13287,19 @@ var require_cn_lib = __commonJS({
           case 1:
             _param = param.tl;
             _flags = {
-              json: flags.json,
+              json: flags2.json,
               quiet: true,
-              verbose: flags.verbose,
-              dry_run: flags.dry_run
+              verbose: flags2.verbose,
+              dry_run: flags2.dry_run
             };
             continue;
           case 2:
             _param = param.tl;
             _flags = {
-              json: flags.json,
-              quiet: flags.quiet,
+              json: flags2.json,
+              quiet: flags2.quiet,
               verbose: true,
-              dry_run: flags.dry_run
+              dry_run: flags2.dry_run
             };
             continue;
         }
@@ -13618,7 +13618,7 @@ var require_cn_lib = __commonJS({
       );
     }
     var help_text = "cn - Coherent Network agent CLI\n\nUsage: cn <command> [options]\n\nCommands:\n  # Agent decisions (output)\n  delete <thread>     GTD: discard\n  defer <thread>      GTD: postpone\n  delegate <t> <peer> GTD: forward\n  do <thread>         GTD: claim/start\n  done <thread>       GTD: complete \xE2\x86\x92 archive\n  reply <thread> <msg> Append to thread\n  send <peer> <msg>   Message to peer (or self)\n  \n  # cn operations (orchestrator)\n  sync                Fetch inbound + send outbound\n  in                  Queue inbox \xE2\x86\x92 input.md \xE2\x86\x92 wake agent (alias: inbound, process)\n  queue [list|clear]  View or clear the task queue\n  mca [list|add <desc>] Surface MCAs for community pickup\n  inbox               List inbox threads\n  outbox              List outbox threads\n  next                Get next inbox item (with cadence)\n  read <thread>       Read thread with cadence\n  \n  # Hub management\n  init [name]         Create new hub\n  status              Show hub state\n  commit [msg]        Stage + commit\n  push                Push to origin\n  save [msg]          Commit + push\n  peer                Manage peers\n  doctor              Health check\n  update              Update cn to latest version\n\nAliases:\n  i = inbox, o = outbox, s = status, d = doctor\n\nFlags:\n  --help, -h          Show help\n  --version, -V       Show version\n  --json              Machine-readable output\n  --quiet, -q         Minimal output\n  --dry-run           Show what would happen\n\nActor Model:\n  cn runs on cron (every 5 min). It:\n  1. Syncs peers \xE2\x86\x92 queues new inbox items to state/queue/\n  2. If input.md empty \xE2\x86\x92 pops from queue \xE2\x86\x92 writes input.md \xE2\x86\x92 wakes agent\n  Agent reads input.md, processes, deletes when done.\n";
-    var version = "2.2.10";
+    var version = "2.2.11";
     module2.exports = {
       starts_with,
       strip_prefix,
@@ -26354,6 +26354,10 @@ var Child_process$1 = {
   exec
 };
 var Json = {};
+var Str = {};
+var check = String.fromCodePoint(10003);
+var cross = String.fromCodePoint(10007);
+var warning = String.fromCodePoint(9888);
 function now_iso(param) {
   return (/* @__PURE__ */ new Date()).toISOString();
 }
@@ -26435,13 +26439,30 @@ function dim(param) {
   return color("2", param);
 }
 function ok(msg) {
-  return color("32", "\xE2\x9C\x93 ") + msg;
+  return color("32", check + " ") + msg;
 }
 function fail(msg) {
-  return color("31", "\xE2\x9C\x97 ") + msg;
+  return color("31", cross + " ") + msg;
 }
 function warn(msg) {
-  return color("33", "\xE2\x9A\xA0 ") + msg;
+  return color("33", warning + " ") + msg;
+}
+var dry_run_mode = {
+  contents: false
+};
+function would(msg) {
+  if (dry_run_mode.contents) {
+    console.log(color("2", "Would: " + msg));
+    return true;
+  } else {
+    return false;
+  }
+}
+function dry_run_banner(param) {
+  if (dry_run_mode.contents) {
+    console.log(warn("DRY RUN \xE2\x80\x94 no changes will be made"));
+    return;
+  }
 }
 function find_hub_path(_dir) {
   while (true) {
@@ -26493,24 +26514,105 @@ function split_lines(s) {
     s
   ));
 }
-function get_peer_branches(hub_path, peer_name) {
-  return Stdlib__List.map((function(branch) {
-    return {
-      peer: peer_name,
-      branch
-    };
-  }), Stdlib__Option.value(
-    Stdlib__Option.map(split_lines, exec_in(hub_path, Curry._1(Stdlib__Printf.sprintf({
+function slugify(s) {
+  return s.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "");
+}
+function threads_in(hub) {
+  return Path.join(hub, "threads/in");
+}
+function threads_mail_inbox(hub) {
+  return Path.join(hub, "threads/mail/inbox");
+}
+function threads_mail_outbox(hub) {
+  return Path.join(hub, "threads/mail/outbox");
+}
+function threads_mail_sent(hub) {
+  return Path.join(hub, "threads/mail/sent");
+}
+function threads_reflections_daily(hub) {
+  return Path.join(hub, "threads/reflections/daily");
+}
+function threads_adhoc(hub) {
+  return Path.join(hub, "threads/adhoc");
+}
+function timestamp_slug(param) {
+  const iso = (/* @__PURE__ */ new Date()).toISOString();
+  const date = Stdlib__String.concat("", Stdlib__String.split_on_char(
+    /* '-' */
+    45,
+    Stdlib__String.sub(iso, 0, 10)
+  ));
+  const time = Stdlib__String.concat("", Stdlib__String.split_on_char(
+    /* ':' */
+    58,
+    Stdlib__String.sub(iso, 11, 8)
+  ));
+  return Curry._2(Stdlib__Printf.sprintf({
+    TAG: (
+      /* Format */
+      0
+    ),
+    _0: {
       TAG: (
-        /* Format */
+        /* String */
+        2
+      ),
+      _0: (
+        /* No_padding */
         0
       ),
-      _0: {
+      _1: {
         TAG: (
-          /* String_literal */
-          11
+          /* Char_literal */
+          12
+        ),
+        _0: (
+          /* '-' */
+          45
+        ),
+        _1: {
+          TAG: (
+            /* String */
+            2
+          ),
+          _0: (
+            /* No_padding */
+            0
+          ),
+          _1: (
+            /* End_of_format */
+            0
+          )
+        }
+      }
+    },
+    _1: "%s-%s"
+  }), date, time);
+}
+function make_thread_filename(slug) {
+  return Curry._2(Stdlib__Printf.sprintf({
+    TAG: (
+      /* Format */
+      0
+    ),
+    _0: {
+      TAG: (
+        /* String */
+        2
+      ),
+      _0: (
+        /* No_padding */
+        0
+      ),
+      _1: {
+        TAG: (
+          /* Char_literal */
+          12
+        ),
+        _0: (
+          /* '-' */
+          45
         ),
-        _0: "git branch -r | grep 'origin/",
         _1: {
           TAG: (
             /* String */
@@ -26525,24 +26627,20 @@ function get_peer_branches(hub_path, peer_name) {
               /* String_literal */
               11
             ),
-            _0: "/' | sed 's/.*origin\\///'",
+            _0: ".md",
             _1: (
               /* End_of_format */
               0
             )
           }
         }
-      },
-      _1: "git branch -r | grep 'origin/%s/' | sed 's/.*origin\\///'"
-    }), peer_name))),
-    /* [] */
-    0
-  ));
+      }
+    },
+    _1: "%s-%s.md"
+  }), timestamp_slug(void 0), slug);
 }
-function inbox_check(hub_path, name) {
-  exec_in(hub_path, "git fetch origin");
-  const peers = load_peers(hub_path);
-  console.log(color("36", Curry._1(Stdlib__Printf.sprintf({
+function delete_remote_branch(hub_path, branch) {
+  if (would(Curry._1(Stdlib__Printf.sprintf({
     TAG: (
       /* Format */
       0
@@ -26552,7 +26650,37 @@ function inbox_check(hub_path, name) {
         /* String_literal */
         11
       ),
-      _0: "Checking inbox for ",
+      _0: "delete remote branch ",
+      _1: {
+        TAG: (
+          /* String */
+          2
+        ),
+        _0: (
+          /* No_padding */
+          0
+        ),
+        _1: (
+          /* End_of_format */
+          0
+        )
+      }
+    },
+    _1: "delete remote branch %s"
+  }), branch))) {
+    return true;
+  }
+  const cmd2 = Curry._1(Stdlib__Printf.sprintf({
+    TAG: (
+      /* Format */
+      0
+    ),
+    _0: {
+      TAG: (
+        /* String_literal */
+        11
+      ),
+      _0: "git push origin --delete ",
       _1: {
         TAG: (
           /* String */
@@ -26567,7 +26695,7 @@ function inbox_check(hub_path, name) {
             /* String_literal */
             11
           ),
-          _0: "...",
+          _0: " 2>/dev/null",
           _1: (
             /* End_of_format */
             0
@@ -26575,26 +26703,71 @@ function inbox_check(hub_path, name) {
         }
       }
     },
-    _1: "Checking inbox for %s..."
-  }), name)));
-  const total = Stdlib__List.fold_left((function(acc, peer) {
-    const match2 = peer.kind;
-    if (match2 === "template") {
-      return acc;
-    }
-    const branches = get_peer_branches(hub_path, peer.name);
-    if (branches) {
-      const msg = Curry._2(Stdlib__Printf.sprintf({
+    _1: "git push origin --delete %s 2>/dev/null"
+  }), branch);
+  const match2 = exec_in(hub_path, cmd2);
+  if (match2 !== void 0) {
+    log_action(hub_path, "branch.delete", branch);
+    console.log(color("2", Curry._1(Stdlib__Printf.sprintf({
+      TAG: (
+        /* Format */
+        0
+      ),
+      _0: {
         TAG: (
-          /* Format */
+          /* String_literal */
+          11
+        ),
+        _0: "  Deleted remote: ",
+        _1: {
+          TAG: (
+            /* String */
+            2
+          ),
+          _0: (
+            /* No_padding */
+            0
+          ),
+          _1: (
+            /* End_of_format */
+            0
+          )
+        }
+      },
+      _1: "  Deleted remote: %s"
+    }), branch)));
+    return true;
+  } else {
+    return false;
+  }
+}
+function is_orphan_branch(hub_path, branch) {
+  const cmd2 = Curry._2(Stdlib__Printf.sprintf({
+    TAG: (
+      /* Format */
+      0
+    ),
+    _0: {
+      TAG: (
+        /* String_literal */
+        11
+      ),
+      _0: "git merge-base main origin/",
+      _1: {
+        TAG: (
+          /* String */
+          2
+        ),
+        _0: (
+          /* No_padding */
           0
         ),
-        _0: {
+        _1: {
           TAG: (
             /* String_literal */
             11
           ),
-          _0: "From ",
+          _0: " 2>/dev/null || git merge-base master origin/",
           _1: {
             TAG: (
               /* String */
@@ -26609,30 +26782,78 @@ function inbox_check(hub_path, name) {
                 /* String_literal */
                 11
               ),
-              _0: ": ",
+              _0: " 2>/dev/null",
+              _1: (
+                /* End_of_format */
+                0
+              )
+            }
+          }
+        }
+      }
+    },
+    _1: "git merge-base main origin/%s 2>/dev/null || git merge-base master origin/%s 2>/dev/null"
+  }), branch, branch);
+  const match2 = exec_in(hub_path, cmd2);
+  return match2 === void 0;
+}
+function get_branch_author(hub_path, branch) {
+  const cmd2 = Curry._1(Stdlib__Printf.sprintf({
+    TAG: (
+      /* Format */
+      0
+    ),
+    _0: {
+      TAG: (
+        /* String_literal */
+        11
+      ),
+      _0: "git log -1 --format='",
+      _1: {
+        TAG: (
+          /* Char_literal */
+          12
+        ),
+        _0: (
+          /* '%' */
+          37
+        ),
+        _1: {
+          TAG: (
+            /* String_literal */
+            11
+          ),
+          _0: "an <",
+          _1: {
+            TAG: (
+              /* Char_literal */
+              12
+            ),
+            _0: (
+              /* '%' */
+              37
+            ),
+            _1: {
+              TAG: (
+                /* String_literal */
+                11
+              ),
+              _0: "ae>' origin/",
               _1: {
                 TAG: (
-                  /* Int */
-                  4
+                  /* String */
+                  2
                 ),
                 _0: (
-                  /* Int_d */
-                  0
-                ),
-                _1: (
                   /* No_padding */
                   0
                 ),
-                _2: (
-                  /* No_precision */
-                  0
-                ),
-                _3: {
+                _1: {
                   TAG: (
                     /* String_literal */
                     11
                   ),
-                  _0: " inbound",
+                  _0: " 2>/dev/null",
                   _1: (
                     /* End_of_format */
                     0
@@ -26641,22 +26862,156 @@ function inbox_check(hub_path, name) {
               }
             }
           }
-        },
-        _1: "From %s: %d inbound"
-      }), peer.name, Stdlib__List.length(branches));
-      console.log(color("33", "\xE2\x9A\xA0 ") + msg);
-      Stdlib__List.iter((function(b) {
-        console.log(Curry._1(Stdlib__Printf.sprintf({
-          TAG: (
-            /* Format */
-            0
-          ),
-          _0: {
+        }
+      }
+    },
+    _1: "git log -1 --format='%%an <%%ae>' origin/%s 2>/dev/null"
+  }), branch);
+  return Stdlib__Option.value(Stdlib__Option.map(Stdlib__String.trim, exec_in(hub_path, cmd2)), "unknown");
+}
+function reject_orphan_branch(hub_path, peer_name, branch) {
+  const author = get_branch_author(hub_path, branch);
+  if (dry_run_mode.contents) {
+    console.log(color("2", Curry._2(Stdlib__Printf.sprintf({
+      TAG: (
+        /* Format */
+        0
+      ),
+      _0: {
+        TAG: (
+          /* String_literal */
+          11
+        ),
+        _0: "Would: reject orphan ",
+        _1: {
+          TAG: (
+            /* String */
+            2
+          ),
+          _0: (
+            /* No_padding */
+            0
+          ),
+          _1: {
+            TAG: (
+              /* String_literal */
+              11
+            ),
+            _0: " (from ",
+            _1: {
+              TAG: (
+                /* String */
+                2
+              ),
+              _0: (
+                /* No_padding */
+                0
+              ),
+              _1: {
+                TAG: (
+                  /* Char_literal */
+                  12
+                ),
+                _0: (
+                  /* ')' */
+                  41
+                ),
+                _1: (
+                  /* End_of_format */
+                  0
+                )
+              }
+            }
+          }
+        }
+      },
+      _1: "Would: reject orphan %s (from %s)"
+    }), branch, author)));
+    console.log(color("2", Curry._1(Stdlib__Printf.sprintf({
+      TAG: (
+        /* Format */
+        0
+      ),
+      _0: {
+        TAG: (
+          /* String_literal */
+          11
+        ),
+        _0: "Would: send rejection notice to ",
+        _1: {
+          TAG: (
+            /* String */
+            2
+          ),
+          _0: (
+            /* No_padding */
+            0
+          ),
+          _1: (
+            /* End_of_format */
+            0
+          )
+        }
+      },
+      _1: "Would: send rejection notice to %s"
+    }), peer_name)));
+  } else {
+    const ts = (/* @__PURE__ */ new Date()).toISOString();
+    const slug = slugify(branch);
+    const filename = make_thread_filename(Curry._1(Stdlib__Printf.sprintf({
+      TAG: (
+        /* Format */
+        0
+      ),
+      _0: {
+        TAG: (
+          /* String_literal */
+          11
+        ),
+        _0: "rejected-",
+        _1: {
+          TAG: (
+            /* String */
+            2
+          ),
+          _0: (
+            /* No_padding */
+            0
+          ),
+          _1: (
+            /* End_of_format */
+            0
+          )
+        }
+      },
+      _1: "rejected-%s"
+    }), slug));
+    const content = Curry._6(Stdlib__Printf.sprintf({
+      TAG: (
+        /* Format */
+        0
+      ),
+      _0: {
+        TAG: (
+          /* String_literal */
+          11
+        ),
+        _0: "---\nto: ",
+        _1: {
+          TAG: (
+            /* String */
+            2
+          ),
+          _0: (
+            /* No_padding */
+            0
+          ),
+          _1: {
             TAG: (
               /* String_literal */
               11
             ),
-            _0: "  \xE2\x86\x90 ",
+            _0: "\ncreated: ",
             _1: {
               TAG: (
                 /* String */
@@ -26666,16 +27021,440 @@ function inbox_check(hub_path, name) {
                 /* No_padding */
                 0
               ),
-              _1: (
-                /* End_of_format */
-                0
-              )
-            }
-          },
-          _1: "  \xE2\x86\x90 %s"
-        }), b.branch));
-      }), branches);
-    } else {
+              _1: {
+                TAG: (
+                  /* String_literal */
+                  11
+                ),
+                _0: "\nsubject: Branch rejected (orphan)\n---\n\nBranch `",
+                _1: {
+                  TAG: (
+                    /* String */
+                    2
+                  ),
+                  _0: (
+                    /* No_padding */
+                    0
+                  ),
+                  _1: {
+                    TAG: (
+                      /* String_literal */
+                      11
+                    ),
+                    _0: "` rejected and deleted.\n\n**Reason:** No merge base with main.\n\nThis happens when pushing from `cn-",
+                    _1: {
+                      TAG: (
+                        /* String */
+                        2
+                      ),
+                      _0: (
+                        /* No_padding */
+                        0
+                      ),
+                      _1: {
+                        TAG: (
+                          /* String_literal */
+                          11
+                        ),
+                        _0: "` instead of `cn-{recipient}-clone`.\n\n**Author:** ",
+                        _1: {
+                          TAG: (
+                            /* String */
+                            2
+                          ),
+                          _0: (
+                            /* No_padding */
+                            0
+                          ),
+                          _1: {
+                            TAG: (
+                              /* String_literal */
+                              11
+                            ),
+                            _0: "\n\n**Fix:**\n1. Delete local branch: `git branch -D ",
+                            _1: {
+                              TAG: (
+                                /* String */
+                                2
+                              ),
+                              _0: (
+                                /* No_padding */
+                                0
+                              ),
+                              _1: {
+                                TAG: (
+                                  /* String_literal */
+                                  11
+                                ),
+                                _0: "`\n2. Re-send via cn outbox (uses clone automatically)\n",
+                                _1: (
+                                  /* End_of_format */
+                                  0
+                                )
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
+      _1: "---\nto: %s\ncreated: %s\nsubject: Branch rejected (orphan)\n---\n\nBranch `%s` rejected and deleted.\n\n**Reason:** No merge base with main.\n\nThis happens when pushing from `cn-%s` instead of `cn-{recipient}-clone`.\n\n**Author:** %s\n\n**Fix:**\n1. Delete local branch: `git branch -D %s`\n2. Re-send via cn outbox (uses clone automatically)\n"
+    }), peer_name, ts, branch, peer_name, author, branch);
+    const outbox_dir = Path.join(hub_path, "threads/mail/outbox");
+    ensure_dir(outbox_dir);
+    const prim0 = Path.join(outbox_dir, filename);
+    Fs.writeFileSync(prim0, content);
+  }
+  delete_remote_branch(hub_path, branch);
+  log_action(hub_path, "inbox.reject", Curry._3(Stdlib__Printf.sprintf({
+    TAG: (
+      /* Format */
+      0
+    ),
+    _0: {
+      TAG: (
+        /* String_literal */
+        11
+      ),
+      _0: "branch:",
+      _1: {
+        TAG: (
+          /* String */
+          2
+        ),
+        _0: (
+          /* No_padding */
+          0
+        ),
+        _1: {
+          TAG: (
+            /* String_literal */
+            11
+          ),
+          _0: " peer:",
+          _1: {
+            TAG: (
+              /* String */
+              2
+            ),
+            _0: (
+              /* No_padding */
+              0
+            ),
+            _1: {
+              TAG: (
+                /* String_literal */
+                11
+              ),
+              _0: " author:",
+              _1: {
+                TAG: (
+                  /* String */
+                  2
+                ),
+                _0: (
+                  /* No_padding */
+                  0
+                ),
+                _1: {
+                  TAG: (
+                    /* String_literal */
+                    11
+                  ),
+                  _0: " reason:orphan",
+                  _1: (
+                    /* End_of_format */
+                    0
+                  )
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    _1: "branch:%s peer:%s author:%s reason:orphan"
+  }), branch, peer_name, author));
+  console.log(fail(Curry._2(Stdlib__Printf.sprintf({
+    TAG: (
+      /* Format */
+      0
+    ),
+    _0: {
+      TAG: (
+        /* String_literal */
+        11
+      ),
+      _0: "Rejected orphan: ",
+      _1: {
+        TAG: (
+          /* String */
+          2
+        ),
+        _0: (
+          /* No_padding */
+          0
+        ),
+        _1: {
+          TAG: (
+            /* String_literal */
+            11
+          ),
+          _0: " (from ",
+          _1: {
+            TAG: (
+              /* String */
+              2
+            ),
+            _0: (
+              /* No_padding */
+              0
+            ),
+            _1: {
+              TAG: (
+                /* Char_literal */
+                12
+              ),
+              _0: (
+                /* ')' */
+                41
+              ),
+              _1: (
+                /* End_of_format */
+                0
+              )
+            }
+          }
+        }
+      }
+    },
+    _1: "Rejected orphan: %s (from %s)"
+  }), branch, author)));
+}
+function get_inbound_branches(clone_path, my_name) {
+  return Stdlib__Option.value(
+    Stdlib__Option.map(split_lines, exec_in(clone_path, Curry._1(Stdlib__Printf.sprintf({
+      TAG: (
+        /* Format */
+        0
+      ),
+      _0: {
+        TAG: (
+          /* String_literal */
+          11
+        ),
+        _0: "git branch -r | grep 'origin/",
+        _1: {
+          TAG: (
+            /* String */
+            2
+          ),
+          _0: (
+            /* No_padding */
+            0
+          ),
+          _1: {
+            TAG: (
+              /* String_literal */
+              11
+            ),
+            _0: "/' | sed 's/.*origin\\///'",
+            _1: (
+              /* End_of_format */
+              0
+            )
+          }
+        }
+      },
+      _1: "git branch -r | grep 'origin/%s/' | sed 's/.*origin\\///'"
+    }), my_name))),
+    /* [] */
+    0
+  );
+}
+function inbox_check(hub_path, name) {
+  const peers = load_peers(hub_path);
+  console.log(color("36", Curry._1(Stdlib__Printf.sprintf({
+    TAG: (
+      /* Format */
+      0
+    ),
+    _0: {
+      TAG: (
+        /* String_literal */
+        11
+      ),
+      _0: "Checking inbox for ",
+      _1: {
+        TAG: (
+          /* String */
+          2
+        ),
+        _0: (
+          /* No_padding */
+          0
+        ),
+        _1: {
+          TAG: (
+            /* String_literal */
+            11
+          ),
+          _0: "...",
+          _1: (
+            /* End_of_format */
+            0
+          )
+        }
+      }
+    },
+    _1: "Checking inbox for %s..."
+  }), name)));
+  const total = Stdlib__List.fold_left((function(acc, peer) {
+    const match2 = peer.kind;
+    const match$1 = peer.clone;
+    if (match2 === "template") {
+      return acc;
+    }
+    if (match$1 !== void 0) {
+      if (Fs.existsSync(match$1)) {
+        exec_in(match$1, "git fetch origin");
+        const branches = get_inbound_branches(match$1, name);
+        if (branches) {
+          console.log(warn(Curry._2(Stdlib__Printf.sprintf({
+            TAG: (
+              /* Format */
+              0
+            ),
+            _0: {
+              TAG: (
+                /* String_literal */
+                11
+              ),
+              _0: "From ",
+              _1: {
+                TAG: (
+                  /* String */
+                  2
+                ),
+                _0: (
+                  /* No_padding */
+                  0
+                ),
+                _1: {
+                  TAG: (
+                    /* String_literal */
+                    11
+                  ),
+                  _0: ": ",
+                  _1: {
+                    TAG: (
+                      /* Int */
+                      4
+                    ),
+                    _0: (
+                      /* Int_d */
+                      0
+                    ),
+                    _1: (
+                      /* No_padding */
+                      0
+                    ),
+                    _2: (
+                      /* No_precision */
+                      0
+                    ),
+                    _3: {
+                      TAG: (
+                        /* String_literal */
+                        11
+                      ),
+                      _0: " inbound",
+                      _1: (
+                        /* End_of_format */
+                        0
+                      )
+                    }
+                  }
+                }
+              }
+            },
+            _1: "From %s: %d inbound"
+          }), peer.name, Stdlib__List.length(branches))));
+          Stdlib__List.iter((function(b) {
+            console.log(Curry._1(Stdlib__Printf.sprintf({
+              TAG: (
+                /* Format */
+                0
+              ),
+              _0: {
+                TAG: (
+                  /* String_literal */
+                  11
+                ),
+                _0: "  \xE2\x86\x90 ",
+                _1: {
+                  TAG: (
+                    /* String */
+                    2
+                  ),
+                  _0: (
+                    /* No_padding */
+                    0
+                  ),
+                  _1: (
+                    /* End_of_format */
+                    0
+                  )
+                }
+              },
+              _1: "  \xE2\x86\x90 %s"
+            }), b));
+          }), branches);
+        } else {
+          console.log(color("2", Curry._1(Stdlib__Printf.sprintf({
+            TAG: (
+              /* Format */
+              0
+            ),
+            _0: {
+              TAG: (
+                /* String_literal */
+                11
+              ),
+              _0: "  ",
+              _1: {
+                TAG: (
+                  /* String */
+                  2
+                ),
+                _0: (
+                  /* No_padding */
+                  0
+                ),
+                _1: {
+                  TAG: (
+                    /* String_literal */
+                    11
+                  ),
+                  _0: ": no inbound",
+                  _1: (
+                    /* End_of_format */
+                    0
+                  )
+                }
+              }
+            },
+            _1: "  %s: no inbound"
+          }), peer.name)));
+        }
+        return acc + Stdlib__List.length(branches) | 0;
+      }
       console.log(color("2", Curry._1(Stdlib__Printf.sprintf({
         TAG: (
           /* Format */
@@ -26701,7 +27480,7 @@ function inbox_check(hub_path, name) {
                 /* String_literal */
                 11
               ),
-              _0: ": no inbound",
+              _0: ": clone not found",
               _1: (
                 /* End_of_format */
                 0
@@ -26709,18 +27488,61 @@ function inbox_check(hub_path, name) {
             }
           }
         },
-        _1: "  %s: no inbound"
+        _1: "  %s: clone not found"
       }), peer.name)));
+      return acc;
     }
-    return acc + Stdlib__List.length(branches) | 0;
+    console.log(color("2", Curry._1(Stdlib__Printf.sprintf({
+      TAG: (
+        /* Format */
+        0
+      ),
+      _0: {
+        TAG: (
+          /* String_literal */
+          11
+        ),
+        _0: "  ",
+        _1: {
+          TAG: (
+            /* String */
+            2
+          ),
+          _0: (
+            /* No_padding */
+            0
+          ),
+          _1: {
+            TAG: (
+              /* String_literal */
+              11
+            ),
+            _0: ": no clone path",
+            _1: (
+              /* End_of_format */
+              0
+            )
+          }
+        }
+      },
+      _1: "  %s: no clone path"
+    }), peer.name)));
+    return acc;
   }), 0, peers);
   if (total === 0) {
-    console.log(color("32", "\xE2\x9C\x93 ") + "Inbox clear");
+    console.log(ok("Inbox clear"));
     return;
   }
 }
-function delete_remote_branch(hub_path, branch) {
-  const cmd2 = Curry._1(Stdlib__Printf.sprintf({
+function materialize_branch(clone_path, hub_path, inbox_dir, peer_name, branch) {
+  if (is_orphan_branch(clone_path, branch)) {
+    reject_orphan_branch(hub_path, peer_name, branch);
+    return (
+      /* [] */
+      0
+    );
+  }
+  const diff_cmd = Curry._2(Stdlib__Printf.sprintf({
     TAG: (
       /* Format */
       0
@@ -26730,7 +27552,7 @@ function delete_remote_branch(hub_path, branch) {
         /* String_literal */
         11
       ),
-      _0: "git push origin --delete ",
+      _0: "git diff main...origin/",
       _1: {
         TAG: (
           /* String */
@@ -26745,7 +27567,104 @@ function delete_remote_branch(hub_path, branch) {
             /* String_literal */
             11
           ),
-          _0: " 2>/dev/null",
+          _0: " --name-only 2>/dev/null || git diff master...origin/",
+          _1: {
+            TAG: (
+              /* String */
+              2
+            ),
+            _0: (
+              /* No_padding */
+              0
+            ),
+            _1: {
+              TAG: (
+                /* String_literal */
+                11
+              ),
+              _0: " --name-only",
+              _1: (
+                /* End_of_format */
+                0
+              )
+            }
+          }
+        }
+      }
+    },
+    _1: "git diff main...origin/%s --name-only 2>/dev/null || git diff master...origin/%s --name-only"
+  }), branch, branch);
+  const files = Stdlib__List.filter(is_md_file, Stdlib__Option.value(
+    Stdlib__Option.map(split_lines, exec_in(clone_path, diff_cmd)),
+    /* [] */
+    0
+  ));
+  const trigger = Stdlib__Option.value(Stdlib__Option.map(Stdlib__String.trim, exec_in(clone_path, Curry._1(Stdlib__Printf.sprintf({
+    TAG: (
+      /* Format */
+      0
+    ),
+    _0: {
+      TAG: (
+        /* String_literal */
+        11
+      ),
+      _0: "git rev-parse origin/",
+      _1: {
+        TAG: (
+          /* String */
+          2
+        ),
+        _0: (
+          /* No_padding */
+          0
+        ),
+        _1: (
+          /* End_of_format */
+          0
+        )
+      }
+    },
+    _1: "git rev-parse origin/%s"
+  }), branch))), "unknown");
+  const match2 = Stdlib__List.rev(Stdlib__String.split_on_char(
+    /* '/' */
+    47,
+    branch
+  ));
+  const branch_slug = match2 ? match2.hd : branch;
+  const inbox_file = make_thread_filename(Curry._2(Stdlib__Printf.sprintf({
+    TAG: (
+      /* Format */
+      0
+    ),
+    _0: {
+      TAG: (
+        /* String */
+        2
+      ),
+      _0: (
+        /* No_padding */
+        0
+      ),
+      _1: {
+        TAG: (
+          /* Char_literal */
+          12
+        ),
+        _0: (
+          /* '-' */
+          45
+        ),
+        _1: {
+          TAG: (
+            /* String */
+            2
+          ),
+          _0: (
+            /* No_padding */
+            0
+          ),
           _1: (
             /* End_of_format */
             0
@@ -26753,12 +27672,126 @@ function delete_remote_branch(hub_path, branch) {
         }
       }
     },
-    _1: "git push origin --delete %s 2>/dev/null"
-  }), branch);
-  const match2 = exec_in(hub_path, cmd2);
-  if (match2 !== void 0) {
-    log_action(hub_path, "branch.delete", branch);
-    console.log(color("2", Curry._1(Stdlib__Printf.sprintf({
+    _1: "%s-%s"
+  }), peer_name, branch_slug));
+  const inbox_path = Path.join(inbox_dir, inbox_file);
+  const already_exists = Stdlib__List.exists((function(f) {
+    if (f.length > 16) {
+      return Cn_lib.ends_with(Curry._2(Stdlib__Printf.sprintf({
+        TAG: (
+          /* Format */
+          0
+        ),
+        _0: {
+          TAG: (
+            /* String */
+            2
+          ),
+          _0: (
+            /* No_padding */
+            0
+          ),
+          _1: {
+            TAG: (
+              /* Char_literal */
+              12
+            ),
+            _0: (
+              /* '-' */
+              45
+            ),
+            _1: {
+              TAG: (
+                /* String */
+                2
+              ),
+              _0: (
+                /* No_padding */
+                0
+              ),
+              _1: {
+                TAG: (
+                  /* String_literal */
+                  11
+                ),
+                _0: ".md",
+                _1: (
+                  /* End_of_format */
+                  0
+                )
+              }
+            }
+          }
+        },
+        _1: "%s-%s.md"
+      }), peer_name, branch_slug), f);
+    } else {
+      return false;
+    }
+  }), Stdlib__Array.to_list(Fs.readdirSync(inbox_dir)));
+  const archived_dir = Path.join(inbox_dir, "_archived");
+  const already_archived = Fs.existsSync(archived_dir) && Stdlib__List.exists((function(f) {
+    if (f.length > 16) {
+      return Cn_lib.ends_with(Curry._2(Stdlib__Printf.sprintf({
+        TAG: (
+          /* Format */
+          0
+        ),
+        _0: {
+          TAG: (
+            /* String */
+            2
+          ),
+          _0: (
+            /* No_padding */
+            0
+          ),
+          _1: {
+            TAG: (
+              /* Char_literal */
+              12
+            ),
+            _0: (
+              /* '-' */
+              45
+            ),
+            _1: {
+              TAG: (
+                /* String */
+                2
+              ),
+              _0: (
+                /* No_padding */
+                0
+              ),
+              _1: {
+                TAG: (
+                  /* String_literal */
+                  11
+                ),
+                _0: ".md",
+                _1: (
+                  /* End_of_format */
+                  0
+                )
+              }
+            }
+          }
+        },
+        _1: "%s-%s.md"
+      }), peer_name, branch_slug), f);
+    } else {
+      return false;
+    }
+  }), Stdlib__Array.to_list(Fs.readdirSync(archived_dir)));
+  if (already_exists || already_archived) {
+    delete_remote_branch(clone_path, branch);
+    return (
+      /* [] */
+      0
+    );
+  } else if (dry_run_mode.contents) {
+    console.log(color("2", Curry._2(Stdlib__Printf.sprintf({
       TAG: (
         /* Format */
         0
@@ -26768,7 +27801,7 @@ function delete_remote_branch(hub_path, branch) {
           /* String_literal */
           11
         ),
-        _0: "  Deleted remote: ",
+        _0: "Would: materialize ",
         _1: {
           TAG: (
             /* String */
@@ -26778,61 +27811,21 @@ function delete_remote_branch(hub_path, branch) {
             /* No_padding */
             0
           ),
-          _1: (
-            /* End_of_format */
-            0
-          )
-        }
-      },
-      _1: "  Deleted remote: %s"
-    }), branch)));
-    return true;
-  } else {
-    return false;
-  }
-}
-function materialize_branch(hub_path, inbox_dir, peer_name, branch) {
-  const diff_cmd = Curry._2(Stdlib__Printf.sprintf({
-    TAG: (
-      /* Format */
-      0
-    ),
-    _0: {
-      TAG: (
-        /* String_literal */
-        11
-      ),
-      _0: "git diff main...origin/",
-      _1: {
-        TAG: (
-          /* String */
-          2
-        ),
-        _0: (
-          /* No_padding */
-          0
-        ),
-        _1: {
-          TAG: (
-            /* String_literal */
-            11
-          ),
-          _0: " --name-only 2>/dev/null || git diff master...origin/",
           _1: {
             TAG: (
-              /* String */
-              2
-            ),
-            _0: (
-              /* No_padding */
-              0
+              /* String_literal */
+              11
             ),
+            _0: " \xE2\x86\x92 ",
             _1: {
               TAG: (
-                /* String_literal */
-                11
+                /* String */
+                2
+              ),
+              _0: (
+                /* No_padding */
+                0
               ),
-              _0: " --name-only",
               _1: (
                 /* End_of_format */
                 0
@@ -26840,72 +27833,20 @@ function materialize_branch(hub_path, inbox_dir, peer_name, branch) {
             }
           }
         }
-      }
-    },
-    _1: "git diff main...origin/%s --name-only 2>/dev/null || git diff master...origin/%s --name-only"
-  }), branch, branch);
-  const files = Stdlib__List.filter(is_md_file, Stdlib__Option.value(
-    Stdlib__Option.map(split_lines, exec_in(hub_path, diff_cmd)),
-    /* [] */
-    0
-  ));
-  const trigger = Stdlib__Option.value(Stdlib__Option.map(Stdlib__String.trim, exec_in(hub_path, Curry._1(Stdlib__Printf.sprintf({
-    TAG: (
-      /* Format */
-      0
-    ),
-    _0: {
-      TAG: (
-        /* String_literal */
-        11
-      ),
-      _0: "git rev-parse origin/",
-      _1: {
-        TAG: (
-          /* String */
-          2
-        ),
-        _0: (
-          /* No_padding */
-          0
-        ),
-        _1: (
-          /* End_of_format */
-          0
-        )
-      }
-    },
-    _1: "git rev-parse origin/%s"
-  }), branch))), "unknown");
-  const match2 = Stdlib__List.rev(Stdlib__String.split_on_char(
-    /* '/' */
-    47,
-    branch
-  ));
-  const branch_slug = match2 ? match2.hd : branch;
-  const inbox_file = Curry._2(Stdlib__Printf.sprintf({
-    TAG: (
-      /* Format */
-      0
-    ),
-    _0: {
+      },
+      _1: "Would: materialize %s \xE2\x86\x92 %s"
+    }), branch, inbox_file)));
+    console.log(color("2", Curry._1(Stdlib__Printf.sprintf({
       TAG: (
-        /* String */
-        2
-      ),
-      _0: (
-        /* No_padding */
+        /* Format */
         0
       ),
-      _1: {
+      _0: {
         TAG: (
-          /* Char_literal */
-          12
-        ),
-        _0: (
-          /* '-' */
-          45
+          /* String_literal */
+          11
         ),
+        _0: "Would: delete remote branch ",
         _1: {
           TAG: (
             /* String */
@@ -26915,30 +27856,21 @@ function materialize_branch(hub_path, inbox_dir, peer_name, branch) {
             /* No_padding */
             0
           ),
-          _1: {
-            TAG: (
-              /* String_literal */
-              11
-            ),
-            _0: ".md",
-            _1: (
-              /* End_of_format */
-              0
-            )
-          }
+          _1: (
+            /* End_of_format */
+            0
+          )
         }
-      }
-    },
-    _1: "%s-%s.md"
-  }), peer_name, branch_slug);
-  const inbox_path = Path.join(inbox_dir, inbox_file);
-  const archived_path = Path.join(Path.join(inbox_dir, "_archived"), inbox_file);
-  if (Fs.existsSync(inbox_path) || Fs.existsSync(archived_path)) {
-    delete_remote_branch(hub_path, branch);
-    return (
-      /* [] */
-      0
-    );
+      },
+      _1: "Would: delete remote branch %s"
+    }), branch)));
+    return {
+      hd: inbox_file,
+      tl: (
+        /* [] */
+        0
+      )
+    };
   } else {
     return Stdlib__List.filter_map((function(file) {
       const show_cmd = Curry._2(Stdlib__Printf.sprintf({
@@ -26989,7 +27921,7 @@ function materialize_branch(hub_path, inbox_dir, peer_name, branch) {
         },
         _1: "git show origin/%s:%s"
       }), branch, file);
-      const content = exec_in(hub_path, show_cmd);
+      const content = exec_in(clone_path, show_cmd);
       if (content === void 0) {
         return;
       }
@@ -27069,25 +28001,34 @@ function materialize_branch(hub_path, inbox_dir, peer_name, branch) {
         },
         _1: "%s trigger:%s"
       }), inbox_file, trigger));
-      delete_remote_branch(hub_path, branch);
+      delete_remote_branch(clone_path, branch);
       return inbox_file;
     }), files);
   }
 }
 function inbox_process(hub_path) {
   console.log(color("36", "Processing inbox..."));
-  const inbox_dir = Path.join(hub_path, "threads/inbox");
+  const inbox_dir = Path.join(hub_path, "threads/mail/inbox");
   ensure_dir(inbox_dir);
+  const my_name = Cn_lib.derive_name(hub_path);
   const peers = load_peers(hub_path);
   const materialized = Stdlib__List.fold_left(
     (function(acc, peer) {
       const match2 = peer.kind;
+      const match$1 = peer.clone;
       if (match2 === "template") {
         return acc;
       }
-      const branches = get_peer_branches(hub_path, peer.name);
-      const files = Stdlib__List.concat_map((function(b) {
-        return materialize_branch(hub_path, inbox_dir, peer.name, b.branch);
+      if (match$1 === void 0) {
+        return acc;
+      }
+      if (!Fs.existsSync(match$1)) {
+        return acc;
+      }
+      exec_in(match$1, "git fetch origin");
+      const branches = get_inbound_branches(match$1, my_name);
+      const files = Stdlib__List.concat_map((function(branch) {
+        return materialize_branch(match$1, hub_path, inbox_dir, peer.name, branch);
       }), branches);
       return Stdlib.$at(acc, files);
     }),
@@ -27096,7 +28037,7 @@ function inbox_process(hub_path) {
     peers
   );
   Stdlib__List.iter((function(f) {
-    const msg = Curry._1(Stdlib__Printf.sprintf({
+    console.log(ok(Curry._1(Stdlib__Printf.sprintf({
       TAG: (
         /* Format */
         0
@@ -27123,11 +28064,10 @@ function inbox_process(hub_path) {
         }
       },
       _1: "Materialized: %s"
-    }), f);
-    console.log(color("32", "\xE2\x9C\x93 ") + msg);
+    }), f)));
   }), materialized);
   if (materialized) {
-    const msg = Curry._1(Stdlib__Printf.sprintf({
+    console.log(ok(Curry._1(Stdlib__Printf.sprintf({
       TAG: (
         /* Format */
         0
@@ -27169,18 +28109,17 @@ function inbox_process(hub_path) {
         }
       },
       _1: "Processed %d thread(s)"
-    }), Stdlib__List.length(materialized));
-    console.log(color("32", "\xE2\x9C\x93 ") + msg);
-    return;
+    }), Stdlib__List.length(materialized))));
+  } else {
+    console.log(color("36", "No new threads to materialize"));
   }
-  console.log(color("36", "No new threads to materialize"));
 }
 function outbox_check(hub_path) {
-  const outbox_dir = Path.join(hub_path, "threads/outbox");
+  const outbox_dir = Path.join(hub_path, "threads/mail/outbox");
   if (Fs.existsSync(outbox_dir)) {
     const ts = Stdlib__List.filter(is_md_file, Stdlib__Array.to_list(Fs.readdirSync(outbox_dir)));
     if (ts) {
-      const msg = Curry._1(Stdlib__Printf.sprintf({
+      console.log(warn(Curry._1(Stdlib__Printf.sprintf({
         TAG: (
           /* Format */
           0
@@ -27215,8 +28154,7 @@ function outbox_check(hub_path) {
           }
         },
         _1: "%d pending send(s):"
-      }), Stdlib__List.length(ts));
-      console.log(color("33", "\xE2\x9A\xA0 ") + msg);
+      }), Stdlib__List.length(ts))));
       return Stdlib__List.iter((function(f) {
         const content = Fs.readFileSync(Path.join(outbox_dir, f), "utf8");
         const meta = Cn_lib.parse_frontmatter(content);
@@ -27271,11 +28209,12 @@ function outbox_check(hub_path) {
           _1: "  \xE2\x86\x92 %s: %s"
         }), to_peer, f));
       }), ts);
+    } else {
+      console.log(ok("Outbox clear"));
+      return;
     }
-    console.log(color("32", "\xE2\x9C\x93 ") + "Outbox clear");
-    return;
   }
-  console.log(color("32", "\xE2\x9C\x93 ") + "Outbox clear");
+  console.log(ok("Outbox clear"));
 }
 function send_thread(hub_path, name, peers, outbox_dir, sent_dir, file) {
   const file_path = Path.join(outbox_dir, file);
@@ -27331,10 +28270,85 @@ function send_thread(hub_path, name, peers, outbox_dir, sent_dir, file) {
                   0
                 )
               }
-            }
-          },
-          _1: "%s/%s"
-        }), name, thread_name);
+            }
+          },
+          _1: "%s/%s"
+        }), name, thread_name);
+        if (dry_run_mode.contents) {
+          console.log(color("2", Curry._3(Stdlib__Printf.sprintf({
+            TAG: (
+              /* Format */
+              0
+            ),
+            _0: {
+              TAG: (
+                /* String_literal */
+                11
+              ),
+              _0: "Would: send ",
+              _1: {
+                TAG: (
+                  /* String */
+                  2
+                ),
+                _0: (
+                  /* No_padding */
+                  0
+                ),
+                _1: {
+                  TAG: (
+                    /* String_literal */
+                    11
+                  ),
+                  _0: " to ",
+                  _1: {
+                    TAG: (
+                      /* String */
+                      2
+                    ),
+                    _0: (
+                      /* No_padding */
+                      0
+                    ),
+                    _1: {
+                      TAG: (
+                        /* String_literal */
+                        11
+                      ),
+                      _0: " (branch: ",
+                      _1: {
+                        TAG: (
+                          /* String */
+                          2
+                        ),
+                        _0: (
+                          /* No_padding */
+                          0
+                        ),
+                        _1: {
+                          TAG: (
+                            /* Char_literal */
+                            12
+                          ),
+                          _0: (
+                            /* ')' */
+                            41
+                          ),
+                          _1: (
+                            /* End_of_format */
+                            0
+                          )
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            _1: "Would: send %s to %s (branch: %s)"
+          }), file, to_peer, branch_name)));
+          return file;
+        }
         const match2 = exec_in(clone_path, "git checkout main 2>/dev/null || git checkout master");
         if (match2 !== void 0) {
           exec_in(clone_path, "git pull --ff-only 2>/dev/null || true");
@@ -27383,7 +28397,7 @@ function send_thread(hub_path, name, peers, outbox_dir, sent_dir, file) {
             },
             _1: "git checkout -b %s 2>/dev/null || git checkout %s"
           }), branch_name, branch_name));
-          const peer_thread_dir = Path.join(clone_path, "threads/adhoc");
+          const peer_thread_dir = Path.join(clone_path, "threads/in");
           ensure_dir(peer_thread_dir);
           const prim0 = Path.join(peer_thread_dir, file);
           Fs.writeFileSync(prim0, content);
@@ -27397,7 +28411,7 @@ function send_thread(hub_path, name, peers, outbox_dir, sent_dir, file) {
                 /* String_literal */
                 11
               ),
-              _0: "git add 'threads/adhoc/",
+              _0: "git add 'threads/in/",
               _1: {
                 TAG: (
                   /* String */
@@ -27423,7 +28437,7 @@ function send_thread(hub_path, name, peers, outbox_dir, sent_dir, file) {
                 }
               }
             },
-            _1: "git add 'threads/adhoc/%s'"
+            _1: "git add 'threads/in/%s'"
           }), file));
           exec_in(clone_path, Curry._2(Stdlib__Printf.sprintf({
             TAG: (
@@ -27574,7 +28588,7 @@ function send_thread(hub_path, name, peers, outbox_dir, sent_dir, file) {
             },
             _1: "to:%s thread:%s"
           }), to_peer, file));
-          const msg = Curry._2(Stdlib__Printf.sprintf({
+          console.log(ok(Curry._2(Stdlib__Printf.sprintf({
             TAG: (
               /* Format */
               0
@@ -27618,8 +28632,7 @@ function send_thread(hub_path, name, peers, outbox_dir, sent_dir, file) {
               }
             },
             _1: "Sent to %s: %s"
-          }), to_peer, file);
-          console.log(color("32", "\xE2\x9C\x93 ") + msg);
+          }), to_peer, file)));
           return file;
         }
         log_action(hub_path, "outbox.send", Curry._2(Stdlib__Printf.sprintf({
@@ -27674,7 +28687,7 @@ function send_thread(hub_path, name, peers, outbox_dir, sent_dir, file) {
           },
           _1: "to:%s thread:%s error:checkout failed"
         }), to_peer, file));
-        const msg$1 = Curry._1(Stdlib__Printf.sprintf({
+        console.log(fail(Curry._1(Stdlib__Printf.sprintf({
           TAG: (
             /* Format */
             0
@@ -27701,8 +28714,7 @@ function send_thread(hub_path, name, peers, outbox_dir, sent_dir, file) {
             }
           },
           _1: "Failed to send %s"
-        }), file);
-        console.log(color("31", "\xE2\x9C\x97 ") + msg$1);
+        }), file)));
         return;
       }
       log_action(hub_path, "outbox.skip", Curry._2(Stdlib__Printf.sprintf({
@@ -27757,7 +28769,7 @@ function send_thread(hub_path, name, peers, outbox_dir, sent_dir, file) {
         },
         _1: "thread:%s to:%s reason:no clone path"
       }), file, to_peer));
-      const msg$2 = Curry._1(Stdlib__Printf.sprintf({
+      console.log(fail(Curry._1(Stdlib__Printf.sprintf({
         TAG: (
           /* Format */
           0
@@ -27784,8 +28796,7 @@ function send_thread(hub_path, name, peers, outbox_dir, sent_dir, file) {
           }
         },
         _1: "No clone path for peer: %s"
-      }), to_peer);
-      console.log(color("31", "\xE2\x9C\x97 ") + msg$2);
+      }), to_peer)));
       return;
     }
     log_action(hub_path, "outbox.skip", Curry._2(Stdlib__Printf.sprintf({
@@ -27840,7 +28851,7 @@ function send_thread(hub_path, name, peers, outbox_dir, sent_dir, file) {
       },
       _1: "thread:%s to:%s reason:unknown peer"
     }), file, to_peer));
-    const msg$3 = Curry._1(Stdlib__Printf.sprintf({
+    console.log(fail(Curry._1(Stdlib__Printf.sprintf({
       TAG: (
         /* Format */
         0
@@ -27867,8 +28878,7 @@ function send_thread(hub_path, name, peers, outbox_dir, sent_dir, file) {
         }
       },
       _1: "Unknown peer: %s"
-    }), to_peer);
-    console.log(color("31", "\xE2\x9C\x97 ") + msg$3);
+    }), to_peer)));
     return;
   }
   log_action(hub_path, "outbox.skip", Curry._1(Stdlib__Printf.sprintf({
@@ -27906,7 +28916,7 @@ function send_thread(hub_path, name, peers, outbox_dir, sent_dir, file) {
     },
     _1: "thread:%s reason:no recipient"
   }), file));
-  const msg$4 = Curry._1(Stdlib__Printf.sprintf({
+  console.log(warn(Curry._1(Stdlib__Printf.sprintf({
     TAG: (
       /* Format */
       0
@@ -27940,12 +28950,11 @@ function send_thread(hub_path, name, peers, outbox_dir, sent_dir, file) {
       }
     },
     _1: "Skipping %s: no 'to:' in frontmatter"
-  }), file);
-  console.log(color("33", "\xE2\x9A\xA0 ") + msg$4);
+  }), file)));
 }
 function outbox_flush(hub_path, name) {
-  const outbox_dir = Path.join(hub_path, "threads/outbox");
-  const sent_dir = Path.join(hub_path, "threads/sent");
+  const outbox_dir = Path.join(hub_path, "threads/mail/outbox");
+  const sent_dir = Path.join(hub_path, "threads/mail/sent");
   if (Fs.existsSync(outbox_dir)) {
     ensure_dir(sent_dir);
     const threads = Stdlib__List.filter(is_md_file, Stdlib__Array.to_list(Fs.readdirSync(outbox_dir)));
@@ -27997,16 +29006,16 @@ function outbox_flush(hub_path, name) {
       Stdlib__List.filter_map((function(param) {
         return send_thread(hub_path, name, peers, outbox_dir, sent_dir, param);
       }), threads);
-      console.log(color("32", "\xE2\x9C\x93 ") + "Outbox flush complete");
+      console.log(ok("Outbox flush complete"));
       return;
     }
-    console.log(color("32", "\xE2\x9C\x93 ") + "Outbox clear");
+    console.log(ok("Outbox clear"));
     return;
   }
-  console.log(color("32", "\xE2\x9C\x93 ") + "Outbox clear");
+  console.log(ok("Outbox clear"));
 }
 function get_next_inbox_item(hub_path) {
-  const inbox_dir = Path.join(hub_path, "threads/inbox");
+  const inbox_dir = Path.join(hub_path, "threads/mail/inbox");
   if (!Fs.existsSync(inbox_dir)) {
     return;
   }
@@ -28193,21 +29202,33 @@ function find_thread(hub_path, thread_id) {
         return path2;
       }
     }), {
-      hd: "inbox",
+      hd: "in",
       tl: {
-        hd: "outbox",
+        hd: "mail/inbox",
         tl: {
-          hd: "doing",
+          hd: "mail/outbox",
           tl: {
-            hd: "deferred",
+            hd: "mail/sent",
             tl: {
-              hd: "daily",
+              hd: "doing",
               tl: {
-                hd: "adhoc",
-                tl: (
-                  /* [] */
-                  0
-                )
+                hd: "deferred",
+                tl: {
+                  hd: "adhoc",
+                  tl: {
+                    hd: "reflections/daily",
+                    tl: {
+                      hd: "reflections/weekly",
+                      tl: {
+                        hd: "reflections/monthly",
+                        tl: (
+                          /* [] */
+                          0
+                        )
+                      }
+                    }
+                  }
+                }
               }
             }
           }
@@ -28259,7 +29280,7 @@ function gtd_delete(hub_path, thread_id) {
   if (path !== void 0) {
     Fs.unlinkSync(path);
     log_action(hub_path, "gtd.delete", thread_id);
-    const msg = Curry._1(Stdlib__Printf.sprintf({
+    console.log(ok(Curry._1(Stdlib__Printf.sprintf({
       TAG: (
         /* Format */
         0
@@ -28286,39 +29307,37 @@ function gtd_delete(hub_path, thread_id) {
         }
       },
       _1: "Deleted: %s"
-    }), thread_id);
-    console.log(color("32", "\xE2\x9C\x93 ") + msg);
-    return;
-  }
-  const msg$1 = Curry._1(Stdlib__Printf.sprintf({
-    TAG: (
-      /* Format */
-      0
-    ),
-    _0: {
+    }), thread_id)));
+  } else {
+    console.log(fail(Curry._1(Stdlib__Printf.sprintf({
       TAG: (
-        /* String_literal */
-        11
+        /* Format */
+        0
       ),
-      _0: "Thread not found: ",
-      _1: {
+      _0: {
         TAG: (
-          /* String */
-          2
-        ),
-        _0: (
-          /* No_padding */
-          0
+          /* String_literal */
+          11
         ),
-        _1: (
-          /* End_of_format */
-          0
-        )
-      }
-    },
-    _1: "Thread not found: %s"
-  }), thread_id);
-  console.log(color("31", "\xE2\x9C\x97 ") + msg$1);
+        _0: "Thread not found: ",
+        _1: {
+          TAG: (
+            /* String */
+            2
+          ),
+          _0: (
+            /* No_padding */
+            0
+          ),
+          _1: (
+            /* End_of_format */
+            0
+          )
+        }
+      },
+      _1: "Thread not found: %s"
+    }), thread_id)));
+  }
 }
 function gtd_defer(hub_path, thread_id, until) {
   const path = find_thread(hub_path, thread_id);
@@ -28385,7 +29404,7 @@ function gtd_defer(hub_path, thread_id, until) {
       _1: "%s until:%s"
     }), thread_id, until_str));
     const suffix = until !== void 0 ? " until " + until : "";
-    const msg = Curry._2(Stdlib__Printf.sprintf({
+    console.log(ok(Curry._2(Stdlib__Printf.sprintf({
       TAG: (
         /* Format */
         0
@@ -28422,11 +29441,10 @@ function gtd_defer(hub_path, thread_id, until) {
         }
       },
       _1: "Deferred: %s%s"
-    }), thread_id, suffix);
-    console.log(color("32", "\xE2\x9C\x93 ") + msg);
+    }), thread_id, suffix)));
     return;
   }
-  const msg$1 = Curry._1(Stdlib__Printf.sprintf({
+  console.log(fail(Curry._1(Stdlib__Printf.sprintf({
     TAG: (
       /* Format */
       0
@@ -28453,13 +29471,12 @@ function gtd_defer(hub_path, thread_id, until) {
       }
     },
     _1: "Thread not found: %s"
-  }), thread_id);
-  console.log(color("31", "\xE2\x9C\x97 ") + msg$1);
+  }), thread_id)));
 }
 function gtd_delegate(hub_path, name, thread_id, peer) {
   const path = find_thread(hub_path, thread_id);
   if (path !== void 0) {
-    const outbox_dir = Path.join(hub_path, "threads/outbox");
+    const outbox_dir = Path.join(hub_path, "threads/mail/outbox");
     ensure_dir(outbox_dir);
     const content = Fs.readFileSync(path, "utf8");
     const prim1 = Cn_lib.update_frontmatter(content, {
@@ -28525,7 +29542,7 @@ function gtd_delegate(hub_path, name, thread_id, peer) {
       },
       _1: "%s to:%s"
     }), thread_id, peer));
-    const msg = Curry._2(Stdlib__Printf.sprintf({
+    console.log(ok(Curry._2(Stdlib__Printf.sprintf({
       TAG: (
         /* Format */
         0
@@ -28569,12 +29586,11 @@ function gtd_delegate(hub_path, name, thread_id, peer) {
         }
       },
       _1: "Delegated to %s: %s"
-    }), peer, thread_id);
-    console.log(color("32", "\xE2\x9C\x93 ") + msg);
+    }), peer, thread_id)));
     console.log(color("36", 'Run "cn sync" to send'));
     return;
   }
-  const msg$1 = Curry._1(Stdlib__Printf.sprintf({
+  console.log(fail(Curry._1(Stdlib__Printf.sprintf({
     TAG: (
       /* Format */
       0
@@ -28601,8 +29617,7 @@ function gtd_delegate(hub_path, name, thread_id, peer) {
       }
     },
     _1: "Thread not found: %s"
-  }), thread_id);
-  console.log(color("31", "\xE2\x9C\x97 ") + msg$1);
+  }), thread_id)));
 }
 function gtd_do(hub_path, thread_id) {
   const path = find_thread(hub_path, thread_id);
@@ -28624,7 +29639,7 @@ function gtd_do(hub_path, thread_id) {
     Fs.writeFileSync(prim0, prim1);
     Fs.unlinkSync(path);
     log_action(hub_path, "gtd.do", thread_id);
-    const msg = Curry._1(Stdlib__Printf.sprintf({
+    console.log(ok(Curry._1(Stdlib__Printf.sprintf({
       TAG: (
         /* Format */
         0
@@ -28651,11 +29666,10 @@ function gtd_do(hub_path, thread_id) {
         }
       },
       _1: "Started: %s"
-    }), thread_id);
-    console.log(color("32", "\xE2\x9C\x93 ") + msg);
+    }), thread_id)));
     return;
   }
-  const msg$1 = Curry._1(Stdlib__Printf.sprintf({
+  console.log(fail(Curry._1(Stdlib__Printf.sprintf({
     TAG: (
       /* Format */
       0
@@ -28682,8 +29696,7 @@ function gtd_do(hub_path, thread_id) {
       }
     },
     _1: "Thread not found: %s"
-  }), thread_id);
-  console.log(color("31", "\xE2\x9C\x97 ") + msg$1);
+  }), thread_id)));
 }
 function gtd_done(hub_path, thread_id) {
   const path = find_thread(hub_path, thread_id);
@@ -28705,7 +29718,7 @@ function gtd_done(hub_path, thread_id) {
     Fs.writeFileSync(prim0, prim1);
     Fs.unlinkSync(path);
     log_action(hub_path, "gtd.done", thread_id);
-    const msg = Curry._1(Stdlib__Printf.sprintf({
+    console.log(ok(Curry._1(Stdlib__Printf.sprintf({
       TAG: (
         /* Format */
         0
@@ -28739,11 +29752,10 @@ function gtd_done(hub_path, thread_id) {
         }
       },
       _1: "Completed: %s \xE2\x86\x92 archived"
-    }), thread_id);
-    console.log(color("32", "\xE2\x9C\x93 ") + msg);
+    }), thread_id)));
     return;
   }
-  const msg$1 = Curry._1(Stdlib__Printf.sprintf({
+  console.log(fail(Curry._1(Stdlib__Printf.sprintf({
     TAG: (
       /* Format */
       0
@@ -28770,8 +29782,7 @@ function gtd_done(hub_path, thread_id) {
       }
     },
     _1: "Thread not found: %s"
-  }), thread_id);
-  console.log(color("31", "\xE2\x9C\x97 ") + msg$1);
+  }), thread_id)));
 }
 function run_read(hub_path, thread_id) {
   const path = find_thread(hub_path, thread_id);
@@ -28896,7 +29907,7 @@ function run_read(hub_path, thread_id) {
     console.log(content);
     return;
   }
-  const msg = Curry._1(Stdlib__Printf.sprintf({
+  console.log(fail(Curry._1(Stdlib__Printf.sprintf({
     TAG: (
       /* Format */
       0
@@ -28923,11 +29934,10 @@ function run_read(hub_path, thread_id) {
       }
     },
     _1: "Thread not found: %s"
-  }), thread_id);
-  console.log(color("31", "\xE2\x9C\x97 ") + msg);
+  }), thread_id)));
 }
 function run_inbox_list(hub_path) {
-  const inbox_dir = Path.join(hub_path, "threads/inbox");
+  const inbox_dir = Path.join(hub_path, "threads/mail/inbox");
   if (Fs.existsSync(inbox_dir)) {
     const ts = Stdlib__List.filter(is_md_file, Stdlib__Array.to_list(Fs.readdirSync(inbox_dir)));
     if (ts) {
@@ -28999,7 +30009,7 @@ function run_inbox_list(hub_path) {
   console.log("(empty)");
 }
 function run_outbox_list(hub_path) {
-  const outbox_dir = Path.join(hub_path, "threads/outbox");
+  const outbox_dir = Path.join(hub_path, "threads/mail/outbox");
   if (Fs.existsSync(outbox_dir)) {
     const ts = Stdlib__List.filter(is_md_file, Stdlib__Array.to_list(Fs.readdirSync(outbox_dir)));
     if (ts) {
@@ -29157,7 +30167,7 @@ function run_commit(hub_path, name, msg) {
   }), escaped));
   if (match2 !== void 0) {
     log_action(hub_path, "commit", message);
-    const msg$1 = Curry._1(Stdlib__Printf.sprintf({
+    console.log(ok(Curry._1(Stdlib__Printf.sprintf({
       TAG: (
         /* Format */
         0
@@ -29184,39 +30194,38 @@ function run_commit(hub_path, name, msg) {
         }
       },
       _1: "Committed: %s"
-    }), message);
-    console.log(color("32", "\xE2\x9C\x93 ") + msg$1);
-    return;
-  }
-  log_action(hub_path, "commit", Curry._1(Stdlib__Printf.sprintf({
-    TAG: (
-      /* Format */
-      0
-    ),
-    _0: {
+    }), message)));
+  } else {
+    log_action(hub_path, "commit", Curry._1(Stdlib__Printf.sprintf({
       TAG: (
-        /* String_literal */
-        11
+        /* Format */
+        0
       ),
-      _0: "error:",
-      _1: {
+      _0: {
         TAG: (
-          /* String */
-          2
-        ),
-        _0: (
-          /* No_padding */
-          0
+          /* String_literal */
+          11
         ),
-        _1: (
-          /* End_of_format */
-          0
-        )
-      }
-    },
-    _1: "error:%s"
-  }), message));
-  console.log(color("31", "\xE2\x9C\x97 ") + "Commit failed");
+        _0: "error:",
+        _1: {
+          TAG: (
+            /* String */
+            2
+          ),
+          _0: (
+            /* No_padding */
+            0
+          ),
+          _1: (
+            /* End_of_format */
+            0
+          )
+        }
+      },
+      _1: "error:%s"
+    }), message));
+    console.log(fail("Commit failed"));
+  }
 }
 function run_push(hub_path) {
   const branch = exec_in(hub_path, "git branch --show-current");
@@ -29252,7 +30261,7 @@ function run_push(hub_path) {
     }), branch$1));
     if (match2 !== void 0) {
       log_action(hub_path, "push", branch$1);
-      const msg = Curry._1(Stdlib__Printf.sprintf({
+      console.log(ok(Curry._1(Stdlib__Printf.sprintf({
         TAG: (
           /* Format */
           0
@@ -29279,18 +30288,17 @@ function run_push(hub_path) {
           }
         },
         _1: "Pushed to origin/%s"
-      }), branch$1);
-      console.log(color("32", "\xE2\x9C\x93 ") + msg);
-      return;
+      }), branch$1)));
+    } else {
+      log_action(hub_path, "push", "error");
+      console.log(fail("Push failed"));
     }
-    log_action(hub_path, "push", "error");
-    console.log(color("31", "\xE2\x9C\x97 ") + "Push failed");
     return;
   }
-  console.log(color("31", "\xE2\x9C\x97 ") + "Could not determine current branch");
+  console.log(fail("Could not determine current branch"));
 }
 function run_send(hub_path, peer, message) {
-  const outbox_dir = Path.join(hub_path, "threads/outbox");
+  const outbox_dir = Path.join(hub_path, "threads/mail/outbox");
   ensure_dir(outbox_dir);
   const slug = message.slice(0, 30).toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "");
   const file_name = slug + ".md";
@@ -29436,7 +30444,7 @@ function run_send(hub_path, peer, message) {
     },
     _1: "to:%s thread:%s"
   }), peer, slug));
-  const msg = Curry._2(Stdlib__Printf.sprintf({
+  console.log(ok(Curry._2(Stdlib__Printf.sprintf({
     TAG: (
       /* Format */
       0
@@ -29480,8 +30488,7 @@ function run_send(hub_path, peer, message) {
       }
     },
     _1: "Created message to %s: %s"
-  }), peer, slug);
-  console.log(color("32", "\xE2\x9C\x93 ") + msg);
+  }), peer, slug)));
   console.log(color("36", 'Run "cn sync" to send'));
 }
 function run_reply(hub_path, thread_id, message) {
@@ -29561,7 +30568,7 @@ function run_reply(hub_path, thread_id, message) {
       },
       _1: "thread:%s"
     }), thread_id));
-    const msg = Curry._1(Stdlib__Printf.sprintf({
+    console.log(ok(Curry._1(Stdlib__Printf.sprintf({
       TAG: (
         /* Format */
         0
@@ -29588,11 +30595,10 @@ function run_reply(hub_path, thread_id, message) {
         }
       },
       _1: "Replied to %s"
-    }), thread_id);
-    console.log(color("32", "\xE2\x9C\x93 ") + msg);
+    }), thread_id)));
     return;
   }
-  const msg$1 = Curry._1(Stdlib__Printf.sprintf({
+  console.log(fail(Curry._1(Stdlib__Printf.sprintf({
     TAG: (
       /* Format */
       0
@@ -29619,8 +30625,7 @@ function run_reply(hub_path, thread_id, message) {
       }
     },
     _1: "Thread not found: %s"
-  }), thread_id);
-  console.log(color("31", "\xE2\x9C\x97 ") + msg$1);
+  }), thread_id)));
 }
 function run_status(hub_path, name) {
   console.log(color("36", Curry._1(Stdlib__Printf.sprintf({
@@ -29689,7 +30694,7 @@ function run_status(hub_path, name) {
       }
     },
     _1: "hub..................... %s\n"
-  }), color("32", "\xE2\x9C\x93"));
+  }), color("32", check));
   Curry._2(Stdlib__Printf.printf({
     TAG: (
       /* Format */
@@ -29747,7 +30752,7 @@ function run_status(hub_path, name) {
       }
     },
     _1: "name.................... %s %s\n"
-  }), color("32", "\xE2\x9C\x93"), name);
+  }), color("32", check), name);
   Curry._2(Stdlib__Printf.printf({
     TAG: (
       /* Format */
@@ -29805,7 +30810,7 @@ function run_status(hub_path, name) {
       }
     },
     _1: "path.................... %s %s\n"
-  }), color("32", "\xE2\x9C\x93"), hub_path);
+  }), color("32", check), hub_path);
   console.log("");
   console.log(color("2", Curry._1(Stdlib__Printf.sprintf({
     TAG: (
@@ -30019,7 +31024,7 @@ function run_doctor(hub_path) {
       /* '.' */
       46
     );
-    const status = c.passed ? color("32", "\xE2\x9C\x93 " + c.value) : color("31", "\xE2\x9C\x97 " + c.value);
+    const status = c.passed ? color("32", check + (" " + c.value)) : color("31", cross + (" " + c.value));
     Curry._3(Stdlib__Printf.printf({
       TAG: (
         /* Format */
@@ -30088,9 +31093,9 @@ function run_doctor(hub_path) {
   }), checks));
   const oks = Stdlib__List.length(checks) - fails | 0;
   if (fails === 0) {
-    console.log(color("32", "\xE2\x9C\x93 ") + "All critical checks passed.");
+    console.log(ok("All critical checks passed."));
   } else {
-    const msg = Curry._1(Stdlib__Printf.sprintf({
+    console.log(fail(Curry._1(Stdlib__Printf.sprintf({
       TAG: (
         /* Format */
         0
@@ -30125,8 +31130,7 @@ function run_doctor(hub_path) {
         }
       },
       _1: "%d issue(s) found."
-    }), fails);
-    console.log(color("31", "\xE2\x9C\x97 ") + msg);
+    }), fails)));
   }
   console.log(color("2", Curry._3(Stdlib__Printf.sprintf({
     TAG: (
@@ -30475,7 +31479,7 @@ function execute_op(hub_path, name, input_id, op) {
     case /* Ack */
     0:
       log_action(hub_path, "op.ack", input_id);
-      const msg = Curry._1(Stdlib__Printf.sprintf({
+      console.log(ok(Curry._1(Stdlib__Printf.sprintf({
         TAG: (
           /* Format */
           0
@@ -30502,14 +31506,13 @@ function execute_op(hub_path, name, input_id, op) {
           }
         },
         _1: "Ack: %s"
-      }), input_id);
-      console.log(color("32", "\xE2\x9C\x93 ") + msg);
+      }), input_id)));
       return;
     case /* Done */
     1:
       const id = op._0;
       log_action(hub_path, "op.done", id);
-      const msg$1 = Curry._1(Stdlib__Printf.sprintf({
+      console.log(ok(Curry._1(Stdlib__Printf.sprintf({
         TAG: (
           /* Format */
           0
@@ -30536,8 +31539,7 @@ function execute_op(hub_path, name, input_id, op) {
           }
         },
         _1: "Done: %s"
-      }), id);
-      console.log(color("32", "\xE2\x9C\x93 ") + msg$1);
+      }), id)));
       return;
     case /* Fail */
     2:
@@ -30588,7 +31590,7 @@ function execute_op(hub_path, name, input_id, op) {
         },
         _1: "id:%s reason:%s"
       }), id$1, reason));
-      const msg$2 = Curry._2(Stdlib__Printf.sprintf({
+      console.log(warn(Curry._2(Stdlib__Printf.sprintf({
         TAG: (
           /* Format */
           0
@@ -30632,8 +31634,7 @@ function execute_op(hub_path, name, input_id, op) {
           }
         },
         _1: "Failed: %s - %s"
-      }), id$1, reason);
-      console.log(color("33", "\xE2\x9A\xA0 ") + msg$2);
+      }), id$1, reason)));
       return;
     case /* Reply */
     3:
@@ -30714,7 +31715,7 @@ function execute_op(hub_path, name, input_id, op) {
           },
           _1: "thread:%s"
         }), id$2));
-        const msg$3 = Curry._1(Stdlib__Printf.sprintf({
+        console.log(ok(Curry._1(Stdlib__Printf.sprintf({
           TAG: (
             /* Format */
             0
@@ -30741,8 +31742,7 @@ function execute_op(hub_path, name, input_id, op) {
             }
           },
           _1: "Replied to %s"
-        }), id$2);
-        console.log(color("32", "\xE2\x9C\x93 ") + msg$3);
+        }), id$2)));
         return;
       }
       log_action(hub_path, "op.reply", Curry._1(Stdlib__Printf.sprintf({
@@ -30780,7 +31780,7 @@ function execute_op(hub_path, name, input_id, op) {
         },
         _1: "thread:%s (not found)"
       }), id$2));
-      const msg$4 = Curry._1(Stdlib__Printf.sprintf({
+      console.log(warn(Curry._1(Stdlib__Printf.sprintf({
         TAG: (
           /* Format */
           0
@@ -30807,25 +31807,24 @@ function execute_op(hub_path, name, input_id, op) {
           }
         },
         _1: "Thread not found for reply: %s"
-      }), id$2);
-      console.log(color("33", "\xE2\x9A\xA0 ") + msg$4);
+      }), id$2)));
       return;
     case /* Send */
     4:
       const body_opt = op._2;
-      const msg$5 = op._1;
+      const msg = op._1;
       const peer = op._0;
-      const outbox_dir = Path.join(hub_path, "threads/outbox");
+      const outbox_dir = Path.join(hub_path, "threads/mail/outbox");
       ensure_dir(outbox_dir);
-      const slug = msg$5.slice(0, 30).toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "");
+      const slug = msg.slice(0, 30).toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "");
       const file_name = slug + ".md";
       const match2 = Stdlib__String.split_on_char(
         /* '\n' */
         10,
-        msg$5
+        msg
       );
-      const first_line = match2 ? match2.hd : msg$5;
-      const body = body_opt !== void 0 ? body_opt : msg$5;
+      const first_line = match2 ? match2.hd : msg;
+      const body = body_opt !== void 0 ? body_opt : msg;
       const content = Curry._5(Stdlib__Printf.sprintf({
         TAG: (
           /* Format */
@@ -30979,7 +31978,7 @@ function execute_op(hub_path, name, input_id, op) {
         },
         _1: "to:%s thread:%s"
       }), peer, slug));
-      const msg$6 = Curry._1(Stdlib__Printf.sprintf({
+      console.log(ok(Curry._1(Stdlib__Printf.sprintf({
         TAG: (
           /* Format */
           0
@@ -31006,8 +32005,7 @@ function execute_op(hub_path, name, input_id, op) {
           }
         },
         _1: "Queued message to %s"
-      }), peer);
-      console.log(color("32", "\xE2\x9C\x93 ") + msg$6);
+      }), peer)));
       return;
     case /* Delegate */
     5:
@@ -31015,7 +32013,7 @@ function execute_op(hub_path, name, input_id, op) {
       const id$3 = op._0;
       const path$1 = find_thread(hub_path, id$3);
       if (path$1 !== void 0) {
-        const outbox_dir$1 = Path.join(hub_path, "threads/outbox");
+        const outbox_dir$1 = Path.join(hub_path, "threads/mail/outbox");
         ensure_dir(outbox_dir$1);
         const content$1 = Fs.readFileSync(path$1, "utf8");
         const prim1 = Cn_lib.update_frontmatter(content$1, {
@@ -31081,7 +32079,7 @@ function execute_op(hub_path, name, input_id, op) {
           },
           _1: "%s to:%s"
         }), id$3, peer$1));
-        const msg$7 = Curry._2(Stdlib__Printf.sprintf({
+        console.log(ok(Curry._2(Stdlib__Printf.sprintf({
           TAG: (
             /* Format */
             0
@@ -31125,11 +32123,10 @@ function execute_op(hub_path, name, input_id, op) {
             }
           },
           _1: "Delegated %s to %s"
-        }), id$3, peer$1);
-        console.log(color("32", "\xE2\x9C\x93 ") + msg$7);
+        }), id$3, peer$1)));
         return;
       }
-      const msg$8 = Curry._1(Stdlib__Printf.sprintf({
+      console.log(warn(Curry._1(Stdlib__Printf.sprintf({
         TAG: (
           /* Format */
           0
@@ -31156,8 +32153,7 @@ function execute_op(hub_path, name, input_id, op) {
           }
         },
         _1: "Thread not found for delegate: %s"
-      }), id$3);
-      console.log(color("33", "\xE2\x9A\xA0 ") + msg$8);
+      }), id$3)));
       return;
     case /* Defer */
     6:
@@ -31225,7 +32221,7 @@ function execute_op(hub_path, name, input_id, op) {
           },
           _1: "%s until:%s"
         }), id$4, until_str));
-        const msg$9 = Curry._1(Stdlib__Printf.sprintf({
+        console.log(ok(Curry._1(Stdlib__Printf.sprintf({
           TAG: (
             /* Format */
             0
@@ -31252,11 +32248,10 @@ function execute_op(hub_path, name, input_id, op) {
             }
           },
           _1: "Deferred %s"
-        }), id$4);
-        console.log(color("32", "\xE2\x9C\x93 ") + msg$9);
+        }), id$4)));
         return;
       }
-      const msg$10 = Curry._1(Stdlib__Printf.sprintf({
+      console.log(warn(Curry._1(Stdlib__Printf.sprintf({
         TAG: (
           /* Format */
           0
@@ -31283,8 +32278,7 @@ function execute_op(hub_path, name, input_id, op) {
           }
         },
         _1: "Thread not found for defer: %s"
-      }), id$4);
-      console.log(color("33", "\xE2\x9A\xA0 ") + msg$10);
+      }), id$4)));
       return;
     case /* Delete */
     7:
@@ -31293,7 +32287,7 @@ function execute_op(hub_path, name, input_id, op) {
       if (path$3 !== void 0) {
         Fs.unlinkSync(path$3);
         log_action(hub_path, "op.delete", id$5);
-        const msg$11 = Curry._1(Stdlib__Printf.sprintf({
+        console.log(ok(Curry._1(Stdlib__Printf.sprintf({
           TAG: (
             /* Format */
             0
@@ -31320,50 +32314,14 @@ function execute_op(hub_path, name, input_id, op) {
             }
           },
           _1: "Deleted %s"
-        }), id$5);
-        console.log(color("32", "\xE2\x9C\x93 ") + msg$11);
-        return;
-      }
-      log_action(hub_path, "op.delete", Curry._1(Stdlib__Printf.sprintf({
-        TAG: (
-          /* Format */
-          0
-        ),
-        _0: {
+        }), id$5)));
+      } else {
+        log_action(hub_path, "op.delete", Curry._1(Stdlib__Printf.sprintf({
           TAG: (
-            /* String */
-            2
-          ),
-          _0: (
-            /* No_padding */
+            /* Format */
             0
           ),
-          _1: {
-            TAG: (
-              /* String_literal */
-              11
-            ),
-            _0: " (not found)",
-            _1: (
-              /* End_of_format */
-              0
-            )
-          }
-        },
-        _1: "%s (not found)"
-      }), id$5));
-      console.log(color("36", Curry._1(Stdlib__Printf.sprintf({
-        TAG: (
-          /* Format */
-          0
-        ),
-        _0: {
-          TAG: (
-            /* String_literal */
-            11
-          ),
-          _0: "Thread already gone: ",
-          _1: {
+          _0: {
             TAG: (
               /* String */
               2
@@ -31372,14 +32330,49 @@ function execute_op(hub_path, name, input_id, op) {
               /* No_padding */
               0
             ),
-            _1: (
-              /* End_of_format */
-              0
-            )
-          }
-        },
-        _1: "Thread already gone: %s"
-      }), id$5)));
+            _1: {
+              TAG: (
+                /* String_literal */
+                11
+              ),
+              _0: " (not found)",
+              _1: (
+                /* End_of_format */
+                0
+              )
+            }
+          },
+          _1: "%s (not found)"
+        }), id$5));
+        console.log(color("36", Curry._1(Stdlib__Printf.sprintf({
+          TAG: (
+            /* Format */
+            0
+          ),
+          _0: {
+            TAG: (
+              /* String_literal */
+              11
+            ),
+            _0: "Thread already gone: ",
+            _1: {
+              TAG: (
+                /* String */
+                2
+              ),
+              _0: (
+                /* No_padding */
+                0
+              ),
+              _1: (
+                /* End_of_format */
+                0
+              )
+            }
+          },
+          _1: "Thread already gone: %s"
+        }), id$5)));
+      }
       return;
     case /* Surface */
     8:
@@ -31572,7 +32565,7 @@ function execute_op(hub_path, name, input_id, op) {
         },
         _1: "id:%s desc:%s"
       }), slug$1, desc));
-      const msg$12 = Curry._1(Stdlib__Printf.sprintf({
+      console.log(ok(Curry._1(Stdlib__Printf.sprintf({
         TAG: (
           /* Format */
           0
@@ -31599,8 +32592,7 @@ function execute_op(hub_path, name, input_id, op) {
           }
         },
         _1: "Surfaced MCA: %s"
-      }), desc);
-      console.log(color("32", "\xE2\x9C\x93 ") + msg$12);
+      }), desc)));
       return;
   }
 }
@@ -31714,7 +32706,7 @@ function archive_io_pair(hub_path, name) {
       },
       _1: "trigger:%s ops:%d"
     }), trigger, Stdlib__List.length(ops)));
-    const msg = Curry._2(Stdlib__Printf.sprintf({
+    console.log(ok(Curry._2(Stdlib__Printf.sprintf({
       TAG: (
         /* Format */
         0
@@ -31773,8 +32765,7 @@ function archive_io_pair(hub_path, name) {
         }
       },
       _1: "Archived: %s (%d ops)"
-    }), trigger, Stdlib__List.length(ops));
-    console.log(color("32", "\xE2\x9C\x93 ") + msg);
+    }), trigger, Stdlib__List.length(ops))));
     return true;
   }
   console.log(color("36", Curry._1(Stdlib__Printf.sprintf({
@@ -31815,7 +32806,7 @@ function archive_io_pair(hub_path, name) {
   return false;
 }
 function queue_inbox_items(hub_path) {
-  const inbox_dir = Path.join(hub_path, "threads/inbox");
+  const inbox_dir = Path.join(hub_path, "threads/mail/inbox");
   if (Fs.existsSync(inbox_dir)) {
     return Stdlib__List.length(Stdlib__List.filter_map((function(file) {
       const file_path = Path.join(inbox_dir, file);
@@ -31852,7 +32843,7 @@ function queue_inbox_items(hub_path) {
         )
       });
       Fs.writeFileSync(file_path, prim1);
-      const msg = Curry._2(Stdlib__Printf.sprintf({
+      console.log(ok(Curry._2(Stdlib__Printf.sprintf({
         TAG: (
           /* Format */
           0
@@ -31906,8 +32897,7 @@ function queue_inbox_items(hub_path) {
           }
         },
         _1: "Queued: %s (from %s)"
-      }), trigger, from);
-      console.log(color("32", "\xE2\x9C\x93 ") + msg);
+      }), trigger, from)));
       return file;
     }), Stdlib__List.filter(is_md_file, Stdlib__Array.to_list(Fs.readdirSync(inbox_dir)))));
   } else {
@@ -31976,7 +32966,7 @@ function feed_next_input(hub_path) {
       },
       _1: "id:%s from:%s"
     }), id, from));
-    const msg = Curry._2(Stdlib__Printf.sprintf({
+    console.log(ok(Curry._2(Stdlib__Printf.sprintf({
       TAG: (
         /* Format */
         0
@@ -32030,8 +33020,7 @@ function feed_next_input(hub_path) {
         }
       },
       _1: "Wrote state/input.md: %s (from %s)"
-    }), id, from);
-    console.log(color("32", "\xE2\x9C\x93 ") + msg);
+    }), id, from)));
     const remaining = queue_count(hub_path);
     if (remaining > 0) {
       console.log(color("36", Curry._1(Stdlib__Printf.sprintf({
@@ -32080,16 +33069,16 @@ function feed_next_input(hub_path) {
     }
     return true;
   }
-  console.log(color("32", "\xE2\x9C\x93 ") + "Queue empty - nothing to process");
+  console.log(ok("Queue empty - nothing to process"));
   return false;
 }
 function wake_agent(param) {
   console.log(color("36", "Triggering OpenClaw wake..."));
   const match2 = exec("openclaw system event --text 'input.md ready' --mode now 2>/dev/null");
   if (match2 !== void 0) {
-    console.log(color("32", "\xE2\x9C\x93 ") + "Wake triggered");
+    console.log(ok("Wake triggered"));
   } else {
-    console.log(color("33", "\xE2\x9A\xA0 ") + "Wake trigger failed - is OpenClaw running?");
+    console.log(warn("Wake trigger failed - is OpenClaw running?"));
   }
 }
 function run_sync(hub_path, name) {
@@ -32097,7 +33086,7 @@ function run_sync(hub_path, name) {
   inbox_check(hub_path, name);
   inbox_process(hub_path);
   outbox_flush(hub_path, name);
-  console.log(color("32", "\xE2\x9C\x93 ") + "Sync complete");
+  console.log(ok("Sync complete"));
 }
 function run_queue_list(hub_path) {
   const items = queue_list(hub_path);
@@ -32257,7 +33246,7 @@ function run_queue_clear(hub_path) {
       },
       _1: "count:%d"
     }), Stdlib__List.length(items)));
-    const msg = Curry._1(Stdlib__Printf.sprintf({
+    console.log(ok(Curry._1(Stdlib__Printf.sprintf({
       TAG: (
         /* Format */
         0
@@ -32299,11 +33288,10 @@ function run_queue_clear(hub_path) {
         }
       },
       _1: "Cleared %d item(s) from queue"
-    }), Stdlib__List.length(items));
-    console.log(color("32", "\xE2\x9C\x93 ") + msg);
+    }), Stdlib__List.length(items))));
     return;
   }
-  console.log(color("32", "\xE2\x9C\x93 ") + "Queue already empty");
+  console.log(ok("Queue already empty"));
 }
 function run_mca_add(hub_path, name, description) {
   const dir = Path.join(hub_path, "state/mca");
@@ -32494,7 +33482,7 @@ function run_mca_add(hub_path, name, description) {
     },
     _1: "id:%s desc:%s"
   }), slug, description));
-  const msg = Curry._1(Stdlib__Printf.sprintf({
+  console.log(ok(Curry._1(Stdlib__Printf.sprintf({
     TAG: (
       /* Format */
       0
@@ -32521,8 +33509,7 @@ function run_mca_add(hub_path, name, description) {
       }
     },
     _1: "MCA surfaced: %s"
-  }), description);
-  console.log(color("32", "\xE2\x9C\x93 ") + msg);
+  }), description)));
 }
 function run_mca_list(hub_path) {
   const dir = Path.join(hub_path, "state/mca");
@@ -33147,7 +34134,7 @@ function run_out(hub_path, name, gtd) {
       _1: "Archived input \xE2\x86\x92 %s"
     }), run_dir)));
   }
-  const outbox_dir = Path.join(hub_path, "threads/outbox");
+  const outbox_dir = Path.join(hub_path, "threads/mail/outbox");
   ensure_dir(outbox_dir);
   if (typeof op_kind === "string") {
     if (op_kind === "Delete") {
@@ -33160,7 +34147,7 @@ function run_out(hub_path, name, gtd) {
   } else {
     const variant = op_kind.NAME;
     if (variant === "Commit") {
-      const msg = Curry._1(Stdlib__Printf.sprintf({
+      console.log(ok(Curry._1(Stdlib__Printf.sprintf({
         TAG: (
           /* Format */
           0
@@ -33187,8 +34174,7 @@ function run_out(hub_path, name, gtd) {
           }
         },
         _1: "Commit recorded: %s"
-      }), op_kind.VAL);
-      console.log(color("32", "\xE2\x9C\x93 ") + msg);
+      }), op_kind.VAL)));
     } else if (variant === "Surface") {
       const desc$1 = op_kind.VAL;
       const mca_dir2 = Path.join(hub_path, "state/mca");
@@ -33223,7 +34209,7 @@ function run_out(hub_path, name, gtd) {
       }), id);
       const prim0$1 = Path.join(mca_dir2, mca_file);
       Fs.writeFileSync(prim0$1, desc$1);
-      const msg$1 = Curry._1(Stdlib__Printf.sprintf({
+      console.log(ok(Curry._1(Stdlib__Printf.sprintf({
         TAG: (
           /* Format */
           0
@@ -33250,10 +34236,9 @@ function run_out(hub_path, name, gtd) {
           }
         },
         _1: "Surfaced MCA: %s"
-      }), desc$1);
-      console.log(color("32", "\xE2\x9C\x93 ") + msg$1);
+      }), desc$1)));
     } else if (variant === "Delegate") {
-      const msg$2 = Curry._1(Stdlib__Printf.sprintf({
+      console.log(ok(Curry._1(Stdlib__Printf.sprintf({
         TAG: (
           /* Format */
           0
@@ -33280,8 +34265,7 @@ function run_out(hub_path, name, gtd) {
           }
         },
         _1: "Delegated to %s"
-      }), op_kind.VAL);
-      console.log(color("32", "\xE2\x9C\x93 ") + msg$2);
+      }), op_kind.VAL)));
     } else if (variant === "Send") {
       const match$2 = op_kind.VAL;
       const to_$2 = match$2[0];
@@ -33407,7 +34391,7 @@ function run_out(hub_path, name, gtd) {
       }), to_$2, (/* @__PURE__ */ new Date()).toISOString(), match$2[1]);
       const prim0$2 = Path.join(outbox_dir, send_file);
       Fs.writeFileSync(prim0$2, send_content);
-      const msg$3 = Curry._1(Stdlib__Printf.sprintf({
+      console.log(ok(Curry._1(Stdlib__Printf.sprintf({
         TAG: (
           /* Format */
           0
@@ -33434,8 +34418,7 @@ function run_out(hub_path, name, gtd) {
           }
         },
         _1: "Send \xE2\x86\x92 outbox/%s"
-      }), send_file);
-      console.log(color("32", "\xE2\x9C\x93 ") + msg$3);
+      }), send_file)));
     } else {
       const reply_file = Curry._2(Stdlib__Printf.sprintf({
         TAG: (
@@ -33573,7 +34556,7 @@ function run_out(hub_path, name, gtd) {
       }), from, id, (/* @__PURE__ */ new Date()).toISOString(), op_kind.VAL);
       const prim0$3 = Path.join(outbox_dir, reply_file);
       Fs.writeFileSync(prim0$3, reply_content);
-      const msg$4 = Curry._1(Stdlib__Printf.sprintf({
+      console.log(ok(Curry._1(Stdlib__Printf.sprintf({
         TAG: (
           /* Format */
           0
@@ -33600,8 +34583,7 @@ function run_out(hub_path, name, gtd) {
           }
         },
         _1: "Reply \xE2\x86\x92 outbox/%s"
-      }), reply_file);
-      console.log(color("32", "\xE2\x9C\x93 ") + msg$4);
+      }), reply_file)));
     }
   }
   const output_content = Curry._4(Stdlib__Printf.sprintf({
@@ -33821,7 +34803,7 @@ function run_out(hub_path, name, gtd) {
   Fs.writeFileSync(prim0$5, meta_content);
   Fs.writeFileSync(inp, "");
   Fs.writeFileSync(outp, "");
-  console.log(color("32", "\xE2\x9C\x93 ") + "State cleared");
+  console.log(ok("State cleared"));
   log_action(hub_path, "out", Curry._3(Stdlib__Printf.sprintf({
     TAG: (
       /* Format */
@@ -33884,7 +34866,7 @@ function run_out(hub_path, name, gtd) {
     },
     _1: "id:%s gtd:%s run:%s"
   }), id, gtd_type, run_dir));
-  const msg$5 = Curry._2(Stdlib__Printf.sprintf({
+  console.log(ok(Curry._2(Stdlib__Printf.sprintf({
     TAG: (
       /* Format */
       0
@@ -33938,8 +34920,7 @@ function run_out(hub_path, name, gtd) {
       }
     },
     _1: "Run complete: %s (%s)"
-  }), gtd_type, id);
-  console.log(color("32", "\xE2\x9C\x93 ") + msg$5);
+  }), gtd_type, id)));
   exec_in(hub_path, Curry._2(Stdlib__Printf.sprintf({
     TAG: (
       /* Format */
@@ -33998,7 +34979,7 @@ function run_out(hub_path, name, gtd) {
     },
     _1: "git add -A && git commit -m 'run: %s %s'"
   }), gtd_type, id));
-  console.log(color("32", "\xE2\x9C\x93 ") + "Committed run");
+  console.log(ok("Committed run"));
 }
 function mca_cycle_path(hub_path) {
   return Path.join(hub_path, "state/.mca-cycle");
@@ -34413,7 +35394,7 @@ function queue_mca_review(hub_path, name) {
     },
     _1: "trigger:%s count:%d"
   }), trigger, Stdlib__List.length(mcas)));
-  const msg = Curry._2(Stdlib__Printf.sprintf({
+  console.log(ok(Curry._2(Stdlib__Printf.sprintf({
     TAG: (
       /* Format */
       0
@@ -34465,8 +35446,7 @@ function queue_mca_review(hub_path, name) {
       }
     },
     _1: "Queued MCA review (%d MCAs) trigger:%s"
-  }), Stdlib__List.length(mcas), Stdlib__String.sub(trigger, 0, 7));
-  console.log(color("32", "\xE2\x9C\x93 ") + msg);
+  }), Stdlib__List.length(mcas), Stdlib__String.sub(trigger, 0, 7))));
 }
 function auto_save(hub_path, name) {
   const status = exec_in(hub_path, "git status --porcelain");
@@ -34555,19 +35535,19 @@ function auto_save(hub_path, name) {
   }), msg));
   if (match2 !== void 0) {
     log_action(hub_path, "auto-save.commit", msg);
-    console.log(color("32", "\xE2\x9C\x93 ") + "Auto-committed changes");
+    console.log(ok("Auto-committed changes"));
     const match$1 = exec_in(hub_path, "git push");
     if (match$1 !== void 0) {
       log_action(hub_path, "auto-save.push", "success");
-      console.log(color("32", "\xE2\x9C\x93 ") + "Auto-pushed to origin");
+      console.log(ok("Auto-pushed to origin"));
     } else {
       log_action(hub_path, "auto-save.push", "failed");
-      console.log(color("33", "\xE2\x9A\xA0 ") + "Auto-push failed");
+      console.log(warn("Auto-push failed"));
     }
     return;
   }
   log_action(hub_path, "auto-save.commit", "failed");
-  console.log(color("33", "\xE2\x9A\xA0 ") + "Auto-commit failed");
+  console.log(warn("Auto-commit failed"));
 }
 function run_inbound(hub_path, name) {
   console.log(color("36", "cn in: handling external input..."));
@@ -34888,13 +35868,13 @@ function update_runtime(hub_path) {
     _1: "# Runtime State\n\nAuto-generated by `cn update`. Do not edit manually.\n\n```yaml\nsession_start: %s\ncn_version: %s\ncn_commit: %s\ntemplate_version: %s\nopenclaw_version: %s\nhub_name: %s\nhub_commit: %s\npeer_count: %d\n```\n"
   }), (/* @__PURE__ */ new Date()).toISOString(), cn_ver, cn_commit, cn_ver, oc_ver, hub_name, hub_commit, peer_count);
   Fs.writeFileSync(runtime_path, content$1);
-  console.log(color("32", "\xE2\x9C\x93 ") + "Updated state/runtime.md");
+  console.log(ok("Updated state/runtime.md"));
 }
 function run_init(name) {
   const hub_name = name !== void 0 ? name : Path.basename(process.cwd());
   const hub_dir = "cn-" + hub_name;
   if (Fs.existsSync(hub_dir)) {
-    const msg = Curry._1(Stdlib__Printf.sprintf({
+    console.log(fail(Curry._1(Stdlib__Printf.sprintf({
       TAG: (
         /* Format */
         0
@@ -34928,8 +35908,7 @@ function run_init(name) {
         }
       },
       _1: "Directory %s already exists"
-    }), hub_dir);
-    console.log(color("31", "\xE2\x9C\x97 ") + msg);
+    }), hub_dir)));
     process.exit(1);
   }
   console.log(color("36", Curry._1(Stdlib__Printf.sprintf({
@@ -34964,9 +35943,13 @@ function run_init(name) {
   mkdir_p(Path.join(hub_dir, ".cn"));
   mkdir_p(Path.join(hub_dir, "spec"));
   mkdir_p(Path.join(hub_dir, "state"));
-  mkdir_p(Path.join(hub_dir, "threads/inbox"));
-  mkdir_p(Path.join(hub_dir, "threads/outbox"));
-  mkdir_p(Path.join(hub_dir, "threads/daily"));
+  mkdir_p(Path.join(hub_dir, "threads/in"));
+  mkdir_p(Path.join(hub_dir, "threads/mail/inbox"));
+  mkdir_p(Path.join(hub_dir, "threads/mail/outbox"));
+  mkdir_p(Path.join(hub_dir, "threads/mail/sent"));
+  mkdir_p(Path.join(hub_dir, "threads/reflections/daily"));
+  mkdir_p(Path.join(hub_dir, "threads/reflections/weekly"));
+  mkdir_p(Path.join(hub_dir, "threads/reflections/monthly"));
   mkdir_p(Path.join(hub_dir, "threads/adhoc"));
   mkdir_p(Path.join(hub_dir, "threads/archived"));
   mkdir_p(Path.join(hub_dir, "logs"));
@@ -35158,7 +36141,7 @@ function run_init(name) {
     },
     _1: "git commit -m 'Initialize %s hub'"
   }), hub_name));
-  const msg$1 = Curry._1(Stdlib__Printf.sprintf({
+  console.log(ok(Curry._1(Stdlib__Printf.sprintf({
     TAG: (
       /* Format */
       0
@@ -35185,8 +36168,7 @@ function run_init(name) {
       }
     },
     _1: "Created hub: %s"
-  }), hub_dir);
-  console.log(color("32", "\xE2\x9C\x93 ") + msg$1);
+  }), hub_dir)));
   console.log(color("36", "Next steps:"));
   console.log(Curry._1(Stdlib__Printf.sprintf({
     TAG: (
@@ -35497,7 +36479,7 @@ function run_peer_add(hub_path, peer_name, url) {
     return p.name === peer_name;
   }), peers);
   if (exists2) {
-    const msg = Curry._1(Stdlib__Printf.sprintf({
+    console.log(fail(Curry._1(Stdlib__Printf.sprintf({
       TAG: (
         /* Format */
         0
@@ -35524,8 +36506,7 @@ function run_peer_add(hub_path, peer_name, url) {
         }
       },
       _1: "Peer already exists: %s"
-    }), peer_name);
-    console.log(color("31", "\xE2\x9C\x97 ") + msg);
+    }), peer_name)));
     process.exit(1);
   }
   const new_peer_hub = url;
@@ -35590,7 +36571,7 @@ function run_peer_add(hub_path, peer_name, url) {
     },
     _1: "name:%s hub:%s"
   }), peer_name, url));
-  const msg$1 = Curry._1(Stdlib__Printf.sprintf({
+  console.log(ok(Curry._1(Stdlib__Printf.sprintf({
     TAG: (
       /* Format */
       0
@@ -35617,8 +36598,7 @@ function run_peer_add(hub_path, peer_name, url) {
       }
     },
     _1: "Added peer: %s"
-  }), peer_name);
-  console.log(color("32", "\xE2\x9C\x93 ") + msg$1);
+  }), peer_name)));
 }
 function run_peer_remove(hub_path, peer_name) {
   const peers = load_peers(hub_path);
@@ -35626,7 +36606,7 @@ function run_peer_remove(hub_path, peer_name) {
     return p.name === peer_name;
   }), peers);
   if (!exists2) {
-    const msg = Curry._1(Stdlib__Printf.sprintf({
+    console.log(fail(Curry._1(Stdlib__Printf.sprintf({
       TAG: (
         /* Format */
         0
@@ -35653,8 +36633,7 @@ function run_peer_remove(hub_path, peer_name) {
         }
       },
       _1: "Peer not found: %s"
-    }), peer_name);
-    console.log(color("31", "\xE2\x9C\x97 ") + msg);
+    }), peer_name)));
     process.exit(1);
   }
   const updated = Stdlib__List.filter((function(p) {
@@ -35664,7 +36643,7 @@ function run_peer_remove(hub_path, peer_name) {
   const prim0 = Path.join(hub_path, "state/peers.md");
   Fs.writeFileSync(prim0, prim1);
   log_action(hub_path, "peer.remove", peer_name);
-  const msg$1 = Curry._1(Stdlib__Printf.sprintf({
+  console.log(ok(Curry._1(Stdlib__Printf.sprintf({
     TAG: (
       /* Format */
       0
@@ -35691,8 +36670,7 @@ function run_peer_remove(hub_path, peer_name) {
       }
     },
     _1: "Removed peer: %s"
-  }), peer_name);
-  console.log(color("32", "\xE2\x9C\x93 ") + msg$1);
+  }), peer_name)));
 }
 function run_peer_sync(hub_path) {
   const peers = load_peers(hub_path);
@@ -35703,7 +36681,7 @@ function run_peer_sync(hub_path) {
       if (Fs.existsSync(clone_path)) {
         const match2 = exec_in(clone_path, "git fetch origin && git pull --ff-only");
         if (match2 !== void 0) {
-          const msg = Curry._1(Stdlib__Printf.sprintf({
+          console.log(ok(Curry._1(Stdlib__Printf.sprintf({
             TAG: (
               /* Format */
               0
@@ -35737,49 +36715,47 @@ function run_peer_sync(hub_path) {
               }
             },
             _1: "  %s: updated"
-          }), peer.name);
-          console.log(color("32", "\xE2\x9C\x93 ") + msg);
-          return;
-        }
-        const msg$1 = Curry._1(Stdlib__Printf.sprintf({
-          TAG: (
-            /* Format */
-            0
-          ),
-          _0: {
+          }), peer.name)));
+        } else {
+          console.log(warn(Curry._1(Stdlib__Printf.sprintf({
             TAG: (
-              /* String_literal */
-              11
+              /* Format */
+              0
             ),
-            _0: "  ",
-            _1: {
+            _0: {
               TAG: (
-                /* String */
-                2
-              ),
-              _0: (
-                /* No_padding */
-                0
+                /* String_literal */
+                11
               ),
+              _0: "  ",
               _1: {
                 TAG: (
-                  /* String_literal */
-                  11
+                  /* String */
+                  2
                 ),
-                _0: ": fetch failed",
-                _1: (
-                  /* End_of_format */
+                _0: (
+                  /* No_padding */
                   0
-                )
+                ),
+                _1: {
+                  TAG: (
+                    /* String_literal */
+                    11
+                  ),
+                  _0: ": fetch failed",
+                  _1: (
+                    /* End_of_format */
+                    0
+                  )
+                }
               }
-            }
-          },
-          _1: "  %s: fetch failed"
-        }), peer.name);
-        console.log(color("33", "\xE2\x9A\xA0 ") + msg$1);
+            },
+            _1: "  %s: fetch failed"
+          }), peer.name)));
+        }
         return;
       }
-      const msg$2 = Curry._2(Stdlib__Printf.sprintf({
+      console.log(warn(Curry._2(Stdlib__Printf.sprintf({
         TAG: (
           /* Format */
           0
@@ -35823,8 +36799,7 @@ function run_peer_sync(hub_path) {
           }
         },
         _1: "  %s: clone not found at %s"
-      }), peer.name, clone_path);
-      console.log(color("33", "\xE2\x9A\xA0 ") + msg$2);
+      }), peer.name, clone_path)));
       return;
     }
     console.log(color("2", Curry._1(Stdlib__Printf.sprintf({
@@ -35863,11 +36838,11 @@ function run_peer_sync(hub_path) {
       _1: "  %s: no clone path"
     }), peer.name)));
   }), peers);
-  console.log(color("32", "\xE2\x9C\x93 ") + "Peer sync complete");
+  console.log(ok("Peer sync complete"));
 }
 function inbox_flush(hub_path, _name) {
   console.log(color("36", "Flushing inbox (deleting processed branches)..."));
-  const inbox_dir = Path.join(hub_path, "threads/inbox");
+  const inbox_dir = Path.join(hub_path, "threads/mail/inbox");
   if (Fs.existsSync(inbox_dir)) {
     const threads = Stdlib__List.filter(is_md_file, Stdlib__Array.to_list(Fs.readdirSync(inbox_dir)));
     const flushed = Stdlib__List.filter_map((function(file) {
@@ -35989,7 +36964,7 @@ function inbox_flush(hub_path, _name) {
         },
         _1: "branch:%s file:%s"
       }), branch, file));
-      const msg = Curry._1(Stdlib__Printf.sprintf({
+      console.log(ok(Curry._1(Stdlib__Printf.sprintf({
         TAG: (
           /* Format */
           0
@@ -36016,12 +36991,11 @@ function inbox_flush(hub_path, _name) {
           }
         },
         _1: "Flushed: %s"
-      }), file);
-      console.log(color("32", "\xE2\x9C\x93 ") + msg);
+      }), file)));
       return file;
     }), threads);
     if (flushed) {
-      const msg = Curry._1(Stdlib__Printf.sprintf({
+      console.log(ok(Curry._1(Stdlib__Printf.sprintf({
         TAG: (
           /* Format */
           0
@@ -36063,14 +37037,13 @@ function inbox_flush(hub_path, _name) {
           }
         },
         _1: "Flushed %d thread(s)"
-      }), Stdlib__List.length(flushed));
-      console.log(color("32", "\xE2\x9C\x93 ") + msg);
-      return;
+      }), Stdlib__List.length(flushed))));
+    } else {
+      console.log(color("36", "No triaged threads to flush"));
     }
-    console.log(color("36", "No triaged threads to flush"));
     return;
   }
-  console.log(color("32", "\xE2\x9C\x93 ") + "Inbox empty");
+  console.log(ok("Inbox empty"));
 }
 function update_cron(hub_path) {
   const cron_line = Curry._1(Stdlib__Printf.sprintf({
@@ -36146,9 +37119,9 @@ function update_cron(hub_path) {
   }), cron_line);
   const match2 = exec(cmd2);
   if (match2 !== void 0) {
-    console.log(color("32", "\xE2\x9C\x93 ") + "Crontab updated");
+    console.log(ok("Crontab updated"));
   } else {
-    console.log(color("33", "\xE2\x9A\xA0 ") + "Crontab update failed - update manually");
+    console.log(warn("Crontab update failed - update manually"));
   }
 }
 function run_update(param) {
@@ -36185,7 +37158,7 @@ function run_update(param) {
   if (latest_raw !== void 0) {
     const latest = Stdlib__String.trim(latest_raw);
     if (latest === Cn_lib.version) {
-      console.log(color("32", "\xE2\x9C\x93 ") + "Already up to date");
+      console.log(ok("Already up to date"));
       return;
     }
     console.log(color("36", Curry._1(Stdlib__Printf.sprintf({
@@ -36219,7 +37192,7 @@ function run_update(param) {
     console.log(color("36", "Updating..."));
     const match2 = exec("npm install -g cnagent@latest");
     if (match2 !== void 0) {
-      const msg = Curry._1(Stdlib__Printf.sprintf({
+      console.log(ok(Curry._1(Stdlib__Printf.sprintf({
         TAG: (
           /* Format */
           0
@@ -36246,14 +37219,13 @@ function run_update(param) {
           }
         },
         _1: "Updated to v%s"
-      }), latest);
-      console.log(color("32", "\xE2\x9C\x93 ") + msg);
-      return;
+      }), latest)));
+    } else {
+      console.log(fail("Update failed. Try: npm install -g cnagent@latest"));
     }
-    console.log(color("31", "\xE2\x9C\x97 ") + "Update failed. Try: npm install -g cnagent@latest");
     return;
   }
-  console.log(color("31", "\xE2\x9C\x97 ") + "Could not check npm registry");
+  console.log(fail("Could not check npm registry"));
   process.exit(1);
 }
 function run_update_with_cron(hub_path) {
@@ -36264,15 +37236,15 @@ function run_update_with_cron(hub_path) {
   exec_in(hub_path, "git add state/runtime.md");
   const commit_result = exec_in(hub_path, "git commit -m 'chore: cn update runtime'");
   if (commit_result !== void 0) {
-    console.log(color("32", "\xE2\x9C\x93 ") + "Committed runtime changes");
+    console.log(ok("Committed runtime changes"));
     const match2 = exec_in(hub_path, "git remote get-url origin 2>/dev/null");
     if (match2 !== void 0) {
       console.log(color("36", "Pushing to origin..."));
       const match$1 = exec_in(hub_path, "git push origin HEAD 2>&1");
       if (match$1 !== void 0) {
-        console.log(color("32", "\xE2\x9C\x93 ") + "Pushed to origin");
+        console.log(ok("Pushed to origin"));
       } else {
-        console.log(color("33", "\xE2\x9A\xA0 ") + "Push failed - push manually");
+        console.log(warn("Push failed - push manually"));
       }
       return;
     }
@@ -36355,7 +37327,7 @@ function self_update_check(param) {
   }), Cn_lib.version, latest)));
   const match2 = exec("npm install -g cnagent@latest 2>/dev/null");
   if (match2 !== void 0) {
-    const msg = Curry._1(Stdlib__Printf.sprintf({
+    console.log(ok(Curry._1(Stdlib__Printf.sprintf({
       TAG: (
         /* Format */
         0
@@ -36382,8 +37354,7 @@ function self_update_check(param) {
         }
       },
       _1: "Updated to cn %s"
-    }), latest);
-    console.log(color("32", "\xE2\x9C\x93 ") + msg);
+    }), latest)));
     const args_str = Stdlib__String.concat(" ", Stdlib__List.tl(args2));
     exec(Curry._1(Stdlib__Printf.sprintf({
       TAG: (
@@ -36416,7 +37387,7 @@ function self_update_check(param) {
     process.exit(0);
     return;
   }
-  console.log(color("33", "\xE2\x9A\xA0 ") + "Self-update failed - continuing with current version");
+  console.log(warn("Self-update failed - continuing with current version"));
 }
 function drop(n, lst) {
   let _n = n;
@@ -36443,6 +37414,11 @@ self_update_check(void 0);
 var args = drop(2, Stdlib__Array.to_list(process.argv));
 var match = Cn_lib.parse_flags(args);
 var cmd_args = match[1];
+var flags = match[0];
+dry_run_mode.contents = flags.dry_run;
+if (flags.dry_run) {
+  dry_run_banner(void 0);
+}
 var cmd = Cn_lib.parse_command(cmd_args);
 if (cmd !== void 0) {
   let exit = 0;
@@ -36671,7 +37647,7 @@ if (cmd !== void 0) {
         }
       }
     } else {
-      console.log(color("31", "\xE2\x9C\x97 ") + "Not in a cn hub.");
+      console.log(fail("Not in a cn hub."));
       console.log("");
       console.log("Either:");
       console.log("  1) cd into an existing hub (cn-sigma, cn-pi, etc.)");
@@ -36681,7 +37657,7 @@ if (cmd !== void 0) {
   }
 } else {
   if (cmd_args) {
-    const msg = Curry._1(Stdlib__Printf.sprintf({
+    console.log(fail(Curry._1(Stdlib__Printf.sprintf({
       TAG: (
         /* Format */
         0
@@ -36708,8 +37684,7 @@ if (cmd !== void 0) {
         }
       },
       _1: "Unknown command: %s"
-    }), cmd_args.hd);
-    console.log(color("31", "\xE2\x9C\x97 ") + msg);
+    }), cmd_args.hd)));
   }
   console.log(Cn_lib.help_text);
   process.exit(1);
@@ -36723,6 +37698,10 @@ module.exports = {
   Yaml,
   Child_process: Child_process$1,
   Json,
+  Str,
+  check,
+  cross,
+  warning,
   now_iso,
   no_color,
   color,
@@ -36735,14 +37714,29 @@ module.exports = {
   fail,
   warn,
   info,
+  dry_run_mode,
+  would,
+  dry_run_banner,
   find_hub_path,
   log_action,
   load_peers,
   is_md_file,
   split_lines,
-  get_peer_branches,
-  inbox_check,
+  slugify,
+  threads_in,
+  threads_mail_inbox,
+  threads_mail_outbox,
+  threads_mail_sent,
+  threads_reflections_daily,
+  threads_adhoc,
+  timestamp_slug,
+  make_thread_filename,
   delete_remote_branch,
+  is_orphan_branch,
+  get_branch_author,
+  reject_orphan_branch,
+  get_inbound_branches,
+  inbox_check,
   materialize_branch,
   inbox_process,
   outbox_check,