cnagent 2.2.5 → 2.2.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnagent",
-  "version": "2.2.5",
+  "version": "2.2.7",
   "description": "Coherent Network agent CLI — everything runs through cn",
   "keywords": [
     "cn-agent",
@@ -35,5 +35,8 @@
   "license": "Apache-2.0",
   "engines": {
     "node": ">=18"
+  },
+  "dependencies": {
+    "yaml": "^2.8.2"
   }
 }

package/tools/dist/cn.js

@@ -13598,7 +13598,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.5";
+    var version = "2.2.7";
     module2.exports = {
       starts_with,
       strip_prefix,
@@ -26292,6 +26292,7 @@ var Fs$1 = {
   ensure_dir
 };
 var Path$1 = {};
+var Yaml = {};
 function exec_in(cwd, cmd2) {
   let result;
   try {
@@ -26428,9 +26429,10 @@ function find_hub_path(_dir) {
     if (dir === "/") {
       return;
     }
-    const has_config = Fs.existsSync(Path.join(dir, ".cn/config.json"));
+    const has_yaml = Fs.existsSync(Path.join(dir, ".cn/config.yaml"));
+    const has_json = Fs.existsSync(Path.join(dir, ".cn/config.json"));
     const has_peers = Fs.existsSync(Path.join(dir, "state/peers.md"));
-    if (has_config || has_peers) {
+    if (has_yaml || has_json || has_peers) {
       return dir;
     }
     _dir = Path.dirname(dir);
@@ -26697,6 +26699,78 @@ function inbox_check(hub_path, name) {
     return;
   }
 }
+function delete_remote_branch(hub_path, branch) {
+  const cmd2 = Curry._1(Stdlib__Printf.sprintf({
+    TAG: (
+      /* Format */
+      0
+    ),
+    _0: {
+      TAG: (
+        /* String_literal */
+        11
+      ),
+      _0: "git push origin --delete ",
+      _1: {
+        TAG: (
+          /* String */
+          2
+        ),
+        _0: (
+          /* No_padding */
+          0
+        ),
+        _1: {
+          TAG: (
+            /* String_literal */
+            11
+          ),
+          _0: " 2>/dev/null",
+          _1: (
+            /* End_of_format */
+            0
+          )
+        }
+      }
+    },
+    _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: (
+          /* 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 materialize_branch(hub_path, inbox_dir, peer_name, branch) {
   const diff_cmd = Curry._2(Stdlib__Printf.sprintf({
     TAG: (
@@ -26750,18 +26824,40 @@ 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);
-  return Stdlib__List.filter_map((function(file) {
-    const show_cmd = Curry._2(Stdlib__Printf.sprintf({
+  const files = Stdlib__List.filter(is_md_file, Stdlib__Option.value(
+    Stdlib__Option.map(split_lines, exec_in(hub_path, diff_cmd)),
+    /* [] */
+    0
+  ));
+  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: {
       TAG: (
-        /* Format */
+        /* String */
+        2
+      ),
+      _0: (
+        /* No_padding */
         0
       ),
-      _0: {
+      _1: {
         TAG: (
-          /* String_literal */
-          11
+          /* Char_literal */
+          12
+        ),
+        _0: (
+          /* '-' */
+          45
         ),
-        _0: "git show origin/",
         _1: {
           TAG: (
             /* String */
@@ -26773,65 +26869,41 @@ function materialize_branch(hub_path, inbox_dir, peer_name, branch) {
           ),
           _1: {
             TAG: (
-              /* Char_literal */
-              12
-            ),
-            _0: (
-              /* ':' */
-              58
+              /* String_literal */
+              11
             ),
-            _1: {
-              TAG: (
-                /* String */
-                2
-              ),
-              _0: (
-                /* No_padding */
-                0
-              ),
-              _1: (
-                /* End_of_format */
-                0
-              )
-            }
+            _0: ".md",
+            _1: (
+              /* End_of_format */
+              0
+            )
           }
         }
-      },
-      _1: "git show origin/%s:%s"
-    }), branch, file);
-    const content = exec_in(hub_path, show_cmd);
-    if (content === void 0) {
-      return;
-    }
-    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: "%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
+    );
+  } else {
+    return Stdlib__List.filter_map((function(file) {
+      const show_cmd = Curry._2(Stdlib__Printf.sprintf({
         TAG: (
-          /* String */
-          2
-        ),
-        _0: (
-          /* No_padding */
+          /* Format */
           0
         ),
-        _1: {
+        _0: {
           TAG: (
-            /* Char_literal */
-            12
-          ),
-          _0: (
-            /* '-' */
-            45
+            /* String_literal */
+            11
           ),
+          _0: "git show origin/",
           _1: {
             TAG: (
               /* String */
@@ -26843,64 +26915,73 @@ function materialize_branch(hub_path, inbox_dir, peer_name, branch) {
             ),
             _1: {
               TAG: (
-                /* String_literal */
-                11
+                /* Char_literal */
+                12
               ),
-              _0: ".md",
-              _1: (
-                /* End_of_format */
-                0
-              )
+              _0: (
+                /* ':' */
+                58
+              ),
+              _1: {
+                TAG: (
+                  /* String */
+                  2
+                ),
+                _0: (
+                  /* No_padding */
+                  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)) {
-      return;
-    }
-    const meta_0 = [
-      "from",
-      peer_name
-    ];
-    const meta_1 = {
-      hd: [
-        "branch",
-        branch
-      ],
-      tl: {
+        },
+        _1: "git show origin/%s:%s"
+      }), branch, file);
+      const content = exec_in(hub_path, show_cmd);
+      if (content === void 0) {
+        return;
+      }
+      const meta_0 = [
+        "from",
+        peer_name
+      ];
+      const meta_1 = {
         hd: [
-          "file",
-          file
+          "branch",
+          branch
         ],
         tl: {
           hd: [
-            "received",
-            (/* @__PURE__ */ new Date()).toISOString()
+            "file",
+            file
           ],
-          tl: (
-            /* [] */
-            0
-          )
+          tl: {
+            hd: [
+              "received",
+              (/* @__PURE__ */ new Date()).toISOString()
+            ],
+            tl: (
+              /* [] */
+              0
+            )
+          }
         }
-      }
-    };
-    const meta = {
-      hd: meta_0,
-      tl: meta_1
-    };
-    const prim1 = Cn_lib.update_frontmatter(content, meta);
-    Fs.writeFileSync(inbox_path, prim1);
-    log_action(hub_path, "inbox.materialize", inbox_file);
-    return inbox_file;
-  }), Stdlib__List.filter(is_md_file, Stdlib__Option.value(
-    Stdlib__Option.map(split_lines, exec_in(hub_path, diff_cmd)),
-    /* [] */
-    0
-  )));
+      };
+      const meta = {
+        hd: meta_0,
+        tl: meta_1
+      };
+      const prim1 = Cn_lib.update_frontmatter(content, meta);
+      Fs.writeFileSync(inbox_path, prim1);
+      log_action(hub_path, "inbox.materialize", inbox_file);
+      delete_remote_branch(hub_path, branch);
+      return inbox_file;
+    }), files);
+  }
 }
 function inbox_process(hub_path) {
   console.log(color("36", "Processing inbox..."));
@@ -29708,14 +29789,17 @@ function run_doctor(hub_path) {
   const v = exec("git --version");
   const v$1 = exec("git config user.name");
   const v$2 = exec("git config user.email");
-  const p = Path.join(hub_path, ".cn/config.json");
-  const p$1 = Path.join(hub_path, "spec/SOUL.md");
-  const p$2 = Path.join(hub_path, "state/peers.md");
+  const yaml_path = Path.join(hub_path, ".cn/config.yaml");
+  const json_path = Path.join(hub_path, ".cn/config.json");
+  const has_yaml = Fs.existsSync(yaml_path);
+  const has_json = Fs.existsSync(json_path);
+  const p = Path.join(hub_path, "spec/SOUL.md");
+  const p$1 = Path.join(hub_path, "state/peers.md");
   let tmp;
-  if (Fs.existsSync(p$2)) {
+  if (Fs.existsSync(p$1)) {
     const count = Stdlib__Option.value(Stdlib__Option.map((function(prim) {
       return prim.length;
-    }), Caml_option.null_to_opt(Fs.readFileSync(p$2, "utf8").match(/- name:/g))), 0);
+    }), Caml_option.null_to_opt(Fs.readFileSync(p$1, "utf8").match(/- name:/g))), 0);
     tmp = {
       name: "state/peers.md",
       passed: true,
@@ -29801,15 +29885,15 @@ function run_doctor(hub_path) {
         },
         tl: {
           hd: {
-            name: ".cn/config.json",
-            passed: Fs.existsSync(p),
-            value: Fs.existsSync(p) ? "exists" : "missing"
+            name: ".cn/config",
+            passed: has_yaml || has_json,
+            value: has_yaml ? "config.yaml" : has_json ? "config.json (migrate to .yaml)" : "missing"
           },
           tl: {
             hd: {
               name: "spec/SOUL.md",
-              passed: Fs.existsSync(p$1),
-              value: Fs.existsSync(p$1) ? "exists" : "missing (optional)"
+              passed: Fs.existsSync(p),
+              value: Fs.existsSync(p) ? "exists" : "missing (optional)"
             },
             tl: {
               hd: tmp,
@@ -34608,7 +34692,7 @@ function run_init(name) {
         /* String_literal */
         11
       ),
-      _0: '{\n  "name": "',
+      _0: "name: ",
       _1: {
         TAG: (
           /* String */
@@ -34623,7 +34707,7 @@ function run_init(name) {
             /* String_literal */
             11
           ),
-          _0: '",\n  "version": "1.0.0",\n  "created": "',
+          _0: "\nversion: 1.0.0\ncreated: ",
           _1: {
             TAG: (
               /* String */
@@ -34635,10 +34719,13 @@ function run_init(name) {
             ),
             _1: {
               TAG: (
-                /* String_literal */
-                11
+                /* Char_literal */
+                12
+              ),
+              _0: (
+                /* '\n' */
+                10
               ),
-              _0: '"\n}',
               _1: (
                 /* End_of_format */
                 0
@@ -34648,9 +34735,9 @@ function run_init(name) {
         }
       }
     },
-    _1: '{\n  "name": "%s",\n  "version": "1.0.0",\n  "created": "%s"\n}'
+    _1: "name: %s\nversion: 1.0.0\ncreated: %s\n"
   }), hub_name, (/* @__PURE__ */ new Date()).toISOString());
-  const prim0 = Path.join(hub_dir, ".cn/config.json");
+  const prim0 = Path.join(hub_dir, ".cn/config.yaml");
   Fs.writeFileSync(prim0, config);
   const soul = Curry._3(Stdlib__Printf.sprintf({
     TAG: (
@@ -36207,6 +36294,7 @@ module.exports = {
   Process,
   Fs: Fs$1,
   Path: Path$1,
+  Yaml,
   Child_process: Child_process$1,
   Json,
   now_iso,
@@ -36228,6 +36316,7 @@ module.exports = {
   split_lines,
   get_peer_branches,
   inbox_check,
+  delete_remote_branch,
   materialize_branch,
   inbox_process,
   outbox_check,