cnagent 2.2.7 → 2.2.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnagent",
-  "version": "2.2.7",
+  "version": "2.2.9",
   "description": "Coherent Network agent CLI — everything runs through cn",
   "keywords": [
     "cn-agent",

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.7";
+    var version = "2.2.9";
     module2.exports = {
       starts_with,
       strip_prefix,
@@ -26829,6 +26829,34 @@ function materialize_branch(hub_path, inbox_dir, peer_name, branch) {
     /* [] */
     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,
@@ -26956,18 +26984,24 @@ function materialize_branch(hub_path, inbox_dir, peer_name, branch) {
         ],
         tl: {
           hd: [
-            "file",
-            file
+            "trigger",
+            trigger
           ],
           tl: {
             hd: [
-              "received",
-              (/* @__PURE__ */ new Date()).toISOString()
+              "file",
+              file
             ],
-            tl: (
-              /* [] */
-              0
-            )
+            tl: {
+              hd: [
+                "received",
+                (/* @__PURE__ */ new Date()).toISOString()
+              ],
+              tl: (
+                /* [] */
+                0
+              )
+            }
           }
         }
       };
@@ -26977,7 +27011,44 @@ function materialize_branch(hub_path, inbox_dir, peer_name, branch) {
       };
       const prim1 = Cn_lib.update_frontmatter(content, meta);
       Fs.writeFileSync(inbox_path, prim1);
-      log_action(hub_path, "inbox.materialize", inbox_file);
+      log_action(hub_path, "inbox.materialize", Curry._2(Stdlib__Printf.sprintf({
+        TAG: (
+          /* Format */
+          0
+        ),
+        _0: {
+          TAG: (
+            /* String */
+            2
+          ),
+          _0: (
+            /* No_padding */
+            0
+          ),
+          _1: {
+            TAG: (
+              /* String_literal */
+              11
+            ),
+            _0: " trigger:",
+            _1: {
+              TAG: (
+                /* String */
+                2
+              ),
+              _0: (
+                /* No_padding */
+                0
+              ),
+              _1: (
+                /* End_of_format */
+                0
+              )
+            }
+          }
+        },
+        _1: "%s trigger:%s"
+      }), inbox_file, trigger));
       delete_remote_branch(hub_path, branch);
       return inbox_file;
     }), files);
@@ -31511,29 +31582,23 @@ function execute_op(hub_path, name, input_id, op) {
       return;
   }
 }
+function generate_trigger(param) {
+  return (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
+}
 function archive_io_pair(hub_path, name) {
   const inp = Path.join(hub_path, "state/input.md");
   const outp = Path.join(hub_path, "state/output.md");
-  const match2 = get_file_id(inp);
-  const match$1 = get_file_id(outp);
-  if (match2 === void 0) {
-    if (match$1 !== void 0) {
-      console.log(color("33", "\xE2\x9A\xA0 ") + "Orphan output.md found (no input.md)");
-      return false;
-    } else {
-      return true;
-    }
-  }
-  if (match$1 === void 0) {
-    return false;
-  }
-  if (match2 === match$1) {
+  const arg = generate_trigger(void 0);
+  const trigger = (function(param) {
+    return Stdlib__Option.value(param, arg);
+  })(get_file_id(inp));
+  if (Fs.existsSync(outp)) {
     const logs_in = Path.join(hub_path, "logs/input");
     const logs_out = Path.join(hub_path, "logs/output");
     ensure_dir(logs_in);
     ensure_dir(logs_out);
     const output_content = Fs.readFileSync(outp, "utf8");
-    const archive_name = match2 + ".md";
+    const archive_name = trigger + ".md";
     const prim1 = Fs.readFileSync(inp, "utf8");
     const prim0 = Path.join(logs_in, archive_name);
     Fs.writeFileSync(prim0, prim1);
@@ -31570,7 +31635,7 @@ function archive_io_pair(hub_path, name) {
         },
         _1: "Executing: %s"
       }), Cn_lib.string_of_agent_op(op))));
-      execute_op(hub_path, name, match2, op);
+      execute_op(hub_path, name, trigger, op);
     }), ops);
     Fs.unlinkSync(inp);
     Fs.unlinkSync(outp);
@@ -31584,7 +31649,7 @@ function archive_io_pair(hub_path, name) {
           /* String_literal */
           11
         ),
-        _0: "id:",
+        _0: "trigger:",
         _1: {
           TAG: (
             /* String */
@@ -31625,8 +31690,8 @@ function archive_io_pair(hub_path, name) {
           }
         }
       },
-      _1: "id:%s ops:%d"
-    }), match2, Stdlib__List.length(ops)));
+      _1: "trigger:%s ops:%d"
+    }), trigger, Stdlib__List.length(ops)));
     const msg = Curry._2(Stdlib__Printf.sprintf({
       TAG: (
         /* Format */
@@ -31637,7 +31702,7 @@ function archive_io_pair(hub_path, name) {
           /* String_literal */
           11
         ),
-        _0: "Archived IO pair: ",
+        _0: "Archived: ",
         _1: {
           TAG: (
             /* String */
@@ -31685,12 +31750,46 @@ function archive_io_pair(hub_path, name) {
           }
         }
       },
-      _1: "Archived IO pair: %s (%d ops)"
-    }), match2, Stdlib__List.length(ops));
+      _1: "Archived: %s (%d ops)"
+    }), trigger, Stdlib__List.length(ops));
     console.log(color("32", "\xE2\x9C\x93 ") + msg);
     return true;
   }
-  console.log(color("31", "\xE2\x9C\x97 ") + "ID mismatch between input.md and output.md");
+  console.log(color("36", Curry._1(Stdlib__Printf.sprintf({
+    TAG: (
+      /* Format */
+      0
+    ),
+    _0: {
+      TAG: (
+        /* String_literal */
+        11
+      ),
+      _0: "Waiting: trigger=",
+      _1: {
+        TAG: (
+          /* String */
+          2
+        ),
+        _0: (
+          /* No_padding */
+          0
+        ),
+        _1: {
+          TAG: (
+            /* String_literal */
+            11
+          ),
+          _0: ", no output yet",
+          _1: (
+            /* End_of_format */
+            0
+          )
+        }
+      }
+    },
+    _1: "Waiting: trigger=%s, no output yet"
+  }), trigger)));
   return false;
 }
 function queue_inbox_items(hub_path) {
@@ -31706,13 +31805,20 @@ function queue_inbox_items(hub_path) {
       if (is_queued) {
         return;
       }
-      const id = Path.basename(file, ".md");
+      const arg = Path.basename(file, ".md");
+      const trigger = (function(param) {
+        return Stdlib__Option.value(param, arg);
+      })(Stdlib__List.find_map((function(param) {
+        if (param[0] === "trigger") {
+          return param[1];
+        }
+      }), meta));
       const from = Stdlib__Option.value(Stdlib__List.find_map((function(param) {
         if (param[0] === "from") {
           return param[1];
         }
       }), meta), "unknown");
-      queue_add(hub_path, id, from, content);
+      queue_add(hub_path, trigger, from, content);
       const prim1 = Cn_lib.update_frontmatter(content, {
         hd: [
           "queued-for-processing",
@@ -31778,7 +31884,7 @@ function queue_inbox_items(hub_path) {
           }
         },
         _1: "Queued: %s (from %s)"
-      }), id, from);
+      }), trigger, from);
       console.log(color("32", "\xE2\x9C\x93 ") + msg);
       return file;
     }), Stdlib__List.filter(is_md_file, Stdlib__Array.to_list(Fs.readdirSync(inbox_dir)))));
@@ -33899,7 +34005,7 @@ function mca_count(hub_path) {
     return 0;
   }
 }
-function queue_mca_review(hub_path) {
+function queue_mca_review(hub_path, name) {
   const dir = Path.join(hub_path, "state/mca");
   const mcas = Stdlib__List.sort(Stdlib__String.compare, Stdlib__List.filter(is_md_file, Stdlib__Array.to_list(Fs.readdirSync(dir))));
   const mca_list = Stdlib__String.concat("\n", Stdlib__List.map((function(file) {
@@ -34032,7 +34138,8 @@ function queue_mca_review(hub_path) {
       _1: "- [%s] %s (by %s)"
     }), id, Stdlib__String.trim(desc), by);
   }), mcas));
-  const review_id = Curry._1(Stdlib__Printf.sprintf({
+  const ts = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
+  const event_file = Curry._1(Stdlib__Printf.sprintf({
     TAG: (
       /* Format */
       0
@@ -34042,7 +34149,7 @@ function queue_mca_review(hub_path) {
         /* String_literal */
         11
       ),
-      _0: "mca-review-",
+      _0: "threads/system/mca-review-",
       _1: {
         TAG: (
           /* String */
@@ -34052,15 +34159,81 @@ function queue_mca_review(hub_path) {
           /* No_padding */
           0
         ),
-        _1: (
-          /* End_of_format */
+        _1: {
+          TAG: (
+            /* String_literal */
+            11
+          ),
+          _0: ".md",
+          _1: (
+            /* End_of_format */
+            0
+          )
+        }
+      }
+    },
+    _1: "threads/system/mca-review-%s.md"
+  }), ts);
+  const body = Curry._2(Stdlib__Printf.sprintf({
+    TAG: (
+      /* Format */
+      0
+    ),
+    _0: {
+      TAG: (
+        /* String_literal */
+        11
+      ),
+      _0: "---\ntype: mca-review\ncreated: ",
+      _1: {
+        TAG: (
+          /* String */
+          2
+        ),
+        _0: (
+          /* No_padding */
           0
-        )
+        ),
+        _1: {
+          TAG: (
+            /* String_literal */
+            11
+          ),
+          _0: "\n---\n\n# MCA Review\n\nReview the MCA queue below. Identify the highest priority MCA with:\n- Lowest cost to complete\n- Highest probability of success\n\nIf you can do it now, do it. Otherwise, explain why not.\n\n## Open MCAs\n\n",
+          _1: {
+            TAG: (
+              /* String */
+              2
+            ),
+            _0: (
+              /* No_padding */
+              0
+            ),
+            _1: {
+              TAG: (
+                /* Char_literal */
+                12
+              ),
+              _0: (
+                /* '\n' */
+                10
+              ),
+              _1: (
+                /* End_of_format */
+                0
+              )
+            }
+          }
+        }
       }
     },
-    _1: "mca-review-%s"
-  }), (/* @__PURE__ */ new Date()).toISOString().slice(0, 10));
-  const body = Curry._1(Stdlib__Printf.sprintf({
+    _1: "---\ntype: mca-review\ncreated: %s\n---\n\n# MCA Review\n\nReview the MCA queue below. Identify the highest priority MCA with:\n- Lowest cost to complete\n- Highest probability of success\n\nIf you can do it now, do it. Otherwise, explain why not.\n\n## Open MCAs\n\n%s\n"
+  }), (/* @__PURE__ */ new Date()).toISOString(), mca_list);
+  const system_dir = Path.join(hub_path, "threads/system");
+  ensure_dir(system_dir);
+  const prim0 = Path.join(hub_path, event_file);
+  Fs.writeFileSync(prim0, body);
+  exec_in(hub_path, Curry._1(Stdlib__Printf.sprintf({
     TAG: (
       /* Format */
       0
@@ -34070,7 +34243,7 @@ function queue_mca_review(hub_path) {
         /* String_literal */
         11
       ),
-      _0: "# MCA Review\n\nReview the MCA queue below. Identify the highest priority MCA with:\n- Lowest cost to complete\n- Highest probability of success\n\nIf you can do it now, do it. Otherwise, explain why not.\n\n## Open MCAs\n\n",
+      _0: "git add '",
       _1: {
         TAG: (
           /* String */
@@ -34086,8 +34259,8 @@ function queue_mca_review(hub_path) {
             12
           ),
           _0: (
-            /* '\n' */
-            10
+            /* '\'' */
+            39
           ),
           _1: (
             /* End_of_format */
@@ -34096,10 +34269,9 @@ function queue_mca_review(hub_path) {
         }
       }
     },
-    _1: "# MCA Review\n\nReview the MCA queue below. Identify the highest priority MCA with:\n- Lowest cost to complete\n- Highest probability of success\n\nIf you can do it now, do it. Otherwise, explain why not.\n\n## Open MCAs\n\n%s\n"
-  }), mca_list);
-  queue_add(hub_path, review_id, "system", body);
-  log_action(hub_path, "mca.review-queued", Curry._1(Stdlib__Printf.sprintf({
+    _1: "git add '%s'"
+  }), event_file));
+  exec_in(hub_path, Curry._1(Stdlib__Printf.sprintf({
     TAG: (
       /* Format */
       0
@@ -34109,33 +34281,117 @@ function queue_mca_review(hub_path) {
         /* String_literal */
         11
       ),
-      _0: "count:",
+      _0: "git commit -m '",
       _1: {
         TAG: (
-          /* Int */
-          4
+          /* String */
+          2
         ),
         _0: (
-          /* Int_d */
-          0
-        ),
-        _1: (
           /* No_padding */
           0
         ),
-        _2: (
-          /* No_precision */
+        _1: {
+          TAG: (
+            /* String_literal */
+            11
+          ),
+          _0: ": system event mca-review'",
+          _1: (
+            /* End_of_format */
+            0
+          )
+        }
+      }
+    },
+    _1: "git commit -m '%s: system event mca-review'"
+  }), name));
+  const arg = Curry._1(Stdlib__Printf.sprintf({
+    TAG: (
+      /* Format */
+      0
+    ),
+    _0: {
+      TAG: (
+        /* String_literal */
+        11
+      ),
+      _0: "mca-review-",
+      _1: {
+        TAG: (
+          /* String */
+          2
+        ),
+        _0: (
+          /* No_padding */
           0
         ),
-        _3: (
+        _1: (
           /* End_of_format */
           0
         )
       }
     },
-    _1: "count:%d"
-  }), Stdlib__List.length(mcas)));
-  const msg = Curry._1(Stdlib__Printf.sprintf({
+    _1: "mca-review-%s"
+  }), ts);
+  const trigger = (function(param) {
+    return Stdlib__Option.value(param, arg);
+  })(Stdlib__Option.map(Stdlib__String.trim, exec_in(hub_path, "git rev-parse HEAD")));
+  queue_add(hub_path, trigger, "system", body);
+  log_action(hub_path, "mca.review-queued", Curry._2(Stdlib__Printf.sprintf({
+    TAG: (
+      /* Format */
+      0
+    ),
+    _0: {
+      TAG: (
+        /* String_literal */
+        11
+      ),
+      _0: "trigger:",
+      _1: {
+        TAG: (
+          /* String */
+          2
+        ),
+        _0: (
+          /* No_padding */
+          0
+        ),
+        _1: {
+          TAG: (
+            /* String_literal */
+            11
+          ),
+          _0: " count:",
+          _1: {
+            TAG: (
+              /* Int */
+              4
+            ),
+            _0: (
+              /* Int_d */
+              0
+            ),
+            _1: (
+              /* No_padding */
+              0
+            ),
+            _2: (
+              /* No_precision */
+              0
+            ),
+            _3: (
+              /* End_of_format */
+              0
+            )
+          }
+        }
+      }
+    },
+    _1: "trigger:%s count:%d"
+  }), trigger, Stdlib__List.length(mcas)));
+  const msg = Curry._2(Stdlib__Printf.sprintf({
     TAG: (
       /* Format */
       0
@@ -34168,16 +34424,26 @@ function queue_mca_review(hub_path) {
             /* String_literal */
             11
           ),
-          _0: " MCAs)",
-          _1: (
-            /* End_of_format */
-            0
-          )
+          _0: " MCAs) trigger:",
+          _1: {
+            TAG: (
+              /* String */
+              2
+            ),
+            _0: (
+              /* No_padding */
+              0
+            ),
+            _1: (
+              /* End_of_format */
+              0
+            )
+          }
         }
       }
     },
-    _1: "Queued MCA review (%d MCAs)"
-  }), Stdlib__List.length(mcas));
+    _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);
 }
 function auto_save(hub_path, name) {
@@ -34331,7 +34597,7 @@ function run_inbound(hub_path, name) {
   }
   const cycle = increment_mca_cycle(hub_path);
   if (cycle % 5 === 0 && mca_count(hub_path) > 0) {
-    queue_mca_review(hub_path);
+    queue_mca_review(hub_path, name);
   }
   const inp = Path.join(hub_path, "state/input.md");
   const outp = Path.join(hub_path, "state/output.md");
@@ -35993,6 +36259,143 @@ function run_update_with_cron(hub_path) {
   }
   console.log(color("2", "No runtime changes to commit"));
 }
+function self_update_check(param) {
+  const args2 = Stdlib__Array.to_list(process.argv);
+  const is_skip_cmd = Stdlib__List.exists((function(a) {
+    if (a === "--help" || a === "-h" || a === "--version" || a === "-V") {
+      return true;
+    } else {
+      return a === "help";
+    }
+  }), args2);
+  if (is_skip_cmd) {
+    return;
+  }
+  const latest_raw = exec("npm view cnagent version --fetch-timeout=5000 2>/dev/null");
+  if (latest_raw === void 0) {
+    return;
+  }
+  const latest = Stdlib__String.trim(latest_raw);
+  if (!(latest !== Cn_lib.version && latest !== "")) {
+    return;
+  }
+  console.log(color("36", Curry._2(Stdlib__Printf.sprintf({
+    TAG: (
+      /* Format */
+      0
+    ),
+    _0: {
+      TAG: (
+        /* String_literal */
+        11
+      ),
+      _0: "Updating cn ",
+      _1: {
+        TAG: (
+          /* String */
+          2
+        ),
+        _0: (
+          /* No_padding */
+          0
+        ),
+        _1: {
+          TAG: (
+            /* String_literal */
+            11
+          ),
+          _0: " \xE2\x86\x92 ",
+          _1: {
+            TAG: (
+              /* String */
+              2
+            ),
+            _0: (
+              /* No_padding */
+              0
+            ),
+            _1: {
+              TAG: (
+                /* String_literal */
+                11
+              ),
+              _0: "...",
+              _1: (
+                /* End_of_format */
+                0
+              )
+            }
+          }
+        }
+      }
+    },
+    _1: "Updating cn %s \xE2\x86\x92 %s..."
+  }), 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({
+      TAG: (
+        /* Format */
+        0
+      ),
+      _0: {
+        TAG: (
+          /* String_literal */
+          11
+        ),
+        _0: "Updated to cn ",
+        _1: {
+          TAG: (
+            /* String */
+            2
+          ),
+          _0: (
+            /* No_padding */
+            0
+          ),
+          _1: (
+            /* End_of_format */
+            0
+          )
+        }
+      },
+      _1: "Updated to cn %s"
+    }), latest);
+    console.log(color("32", "\xE2\x9C\x93 ") + msg);
+    const args_str = Stdlib__String.concat(" ", Stdlib__List.tl(args2));
+    exec(Curry._1(Stdlib__Printf.sprintf({
+      TAG: (
+        /* Format */
+        0
+      ),
+      _0: {
+        TAG: (
+          /* String_literal */
+          11
+        ),
+        _0: "cn ",
+        _1: {
+          TAG: (
+            /* String */
+            2
+          ),
+          _0: (
+            /* No_padding */
+            0
+          ),
+          _1: (
+            /* End_of_format */
+            0
+          )
+        }
+      },
+      _1: "cn %s"
+    }), args_str));
+    process.exit(0);
+    return;
+  }
+  console.log(color("33", "\xE2\x9A\xA0 ") + "Self-update failed - continuing with current version");
+}
 function drop(n, lst) {
   let _n = n;
   let _lst = lst;
@@ -36014,6 +36417,7 @@ function drop(n, lst) {
   }
   ;
 }
+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];
@@ -36351,6 +36755,7 @@ module.exports = {
   get_file_id,
   mca_dir,
   execute_op,
+  generate_trigger,
   archive_io_pair,
   queue_inbox_items,
   feed_next_input,
@@ -36380,5 +36785,6 @@ module.exports = {
   update_cron,
   run_update,
   run_update_with_cron,
+  self_update_check,
   drop
 };