agent-remnote 0.0.2 → 0.1.0

package/dist/main.js

@@ -75248,6 +75248,257 @@ function sanitizeRemnoteWritePayload(value8) {
   return out;
 }
 
+// src/kernel/op-catalog/catalog.ts
+var OP_CATALOG = {
+  create_rem: {
+    op_type: "create_rem",
+    aliases: ["rem.create"],
+    payload: {
+      required: ["parent_id"],
+      optional: ["text", "tags", "is_document", "position", "client_temp_id"]
+    },
+    description: "Create a Rem (parent required).",
+    id_fields: ["parent_id", "tags[]"]
+  },
+  create_portal: {
+    op_type: "create_portal",
+    aliases: ["portal.create", "rem.createPortal"],
+    payload: {
+      required: ["parent_id", "target_rem_id"],
+      optional: ["position", "client_temp_id"]
+    },
+    description: "Create a portal under parent that directly includes target_rem_id.",
+    id_fields: ["parent_id", "target_rem_id"]
+  },
+  create_link_rem: {
+    op_type: "create_link_rem",
+    aliases: ["rem.createLink"],
+    payload: {
+      required: ["url", "parent_id"],
+      optional: ["add_title", "client_temp_id"]
+    },
+    description: "Create a link Rem (parent required).",
+    id_fields: ["parent_id"]
+  },
+  update_text: {
+    op_type: "update_text",
+    aliases: ["rem.updateText"],
+    payload: { required: ["rem_id", "text"], optional: [] },
+    description: "Update Rem text.",
+    id_fields: ["rem_id"]
+  },
+  move_rem: {
+    op_type: "move_rem",
+    aliases: ["rem.move"],
+    payload: { required: ["rem_id", "new_parent_id"], optional: ["position"] },
+    description: "Move a Rem to a new parent.",
+    id_fields: ["rem_id", "new_parent_id"]
+  },
+  delete_rem: {
+    op_type: "delete_rem",
+    aliases: ["rem.delete"],
+    payload: { required: ["rem_id"], optional: [] },
+    description: "Delete a Rem.",
+    id_fields: ["rem_id"]
+  },
+  create_single_rem_with_markdown: {
+    op_type: "create_single_rem_with_markdown",
+    aliases: ["rem.createSingleWithMarkdown"],
+    payload: { required: ["parent_id", "markdown"], optional: ["client_temp_id"] },
+    description: "Create a single Rem from Markdown (parent required).",
+    id_fields: ["parent_id"]
+  },
+  create_tree_with_markdown: {
+    op_type: "create_tree_with_markdown",
+    aliases: ["rem.createTreeWithMarkdown"],
+    payload: {
+      required: ["parent_id", "markdown"],
+      optional: [
+        "position",
+        "indent_mode",
+        "indent_size",
+        "parse_mode",
+        "prepared",
+        "client_temp_ids",
+        "bundle"
+      ]
+    },
+    description: "Create a tree from Markdown (parent required).",
+    id_fields: ["parent_id"]
+  },
+  replace_selection_with_markdown: {
+    op_type: "replace_selection_with_markdown",
+    payload: {
+      required: ["markdown"],
+      optional: ["target", "require_same_parent", "require_contiguous", "portal_id"]
+    },
+    description: "Replace a selection of Rems with Markdown.",
+    id_fields: ["target.rem_ids[]", "portal_id"]
+  },
+  daily_note_write: {
+    op_type: "daily_note_write",
+    payload: {
+      required: [],
+      optional: ["text", "markdown", "date", "offset_days", "prepend", "position", "bundle"]
+    },
+    description: "Write to Daily Note.",
+    id_fields: []
+  },
+  add_tag: {
+    op_type: "add_tag",
+    aliases: ["tag.add"],
+    payload: { required: ["rem_id", "tag_id"], optional: [] },
+    description: "Add a tag to a Rem.",
+    id_fields: ["rem_id", "tag_id"]
+  },
+  remove_tag: {
+    op_type: "remove_tag",
+    aliases: ["tag.remove"],
+    payload: { required: ["rem_id", "tag_id"], optional: ["remove_properties"] },
+    description: "Remove a tag from a Rem.",
+    id_fields: ["rem_id", "tag_id"]
+  },
+  set_attribute: {
+    op_type: "set_attribute",
+    aliases: ["attribute.set"],
+    payload: { required: ["rem_id", "property_id"], optional: ["value"] },
+    description: "Set an attribute value (RichText).",
+    id_fields: ["rem_id", "property_id"]
+  },
+  table_cell_write: {
+    op_type: "table_cell_write",
+    aliases: ["table.cellWrite"],
+    payload: { required: ["rem_id", "property_id"], optional: ["value"] },
+    description: "Write text/RichText into a table cell (alias of set_attribute).",
+    id_fields: ["rem_id", "property_id"]
+  },
+  create_table: {
+    op_type: "create_table",
+    aliases: ["table.create"],
+    payload: { required: ["parent_id"], optional: ["tag_id", "position", "client_temp_id"] },
+    description: "Create a table (parent required; optional header Tag).",
+    id_fields: ["parent_id", "tag_id"]
+  },
+  add_property: {
+    op_type: "add_property",
+    aliases: ["property.add"],
+    payload: { required: ["tag_id"], optional: ["name", "property_id", "type", "options"] },
+    description: "Add a property under a table header Tag.",
+    id_fields: ["tag_id"]
+  },
+  set_property_type: {
+    op_type: "set_property_type",
+    aliases: ["property.setType"],
+    payload: { required: ["property_id", "type"], optional: [] },
+    description: "Set property type.",
+    id_fields: ["property_id"]
+  },
+  set_table_filter: {
+    op_type: "set_table_filter",
+    aliases: ["table.setFilter"],
+    payload: { required: ["table_id"], optional: ["column_id", "contains_text", "expr"] },
+    description: "Set a table filter (Query expression).",
+    id_fields: ["table_id", "column_id"]
+  },
+  add_option: {
+    op_type: "add_option",
+    aliases: ["option.add"],
+    payload: { required: ["property_id", "text"], optional: ["option_id"] },
+    description: "Add an option under a property.",
+    id_fields: ["property_id"]
+  },
+  remove_option: {
+    op_type: "remove_option",
+    aliases: ["option.remove"],
+    payload: { required: ["option_id"], optional: [] },
+    description: "Remove an option.",
+    id_fields: ["option_id"]
+  },
+  table_add_row: {
+    op_type: "table_add_row",
+    aliases: ["table.addRow"],
+    payload: {
+      required: ["table_tag_id"],
+      optional: ["parent_id", "rem_id", "text", "client_temp_id", "values", "extra_tags"]
+    },
+    description: "Add a row to a table (tag a Rem, optionally creating a new one).",
+    id_fields: ["table_tag_id", "parent_id", "rem_id", "extra_tags[]", "values[].property_id"]
+  },
+  table_remove_row: {
+    op_type: "table_remove_row",
+    aliases: ["table.removeRow"],
+    payload: { required: ["table_tag_id", "rem_id"], optional: ["remove_properties"] },
+    description: "Remove a row tag from a table.",
+    id_fields: ["table_tag_id", "rem_id"]
+  },
+  set_cell_select: {
+    op_type: "set_cell_select",
+    aliases: ["cell.setSelect"],
+    payload: { required: ["rem_id", "property_id", "option_ids"], optional: [] },
+    description: "Set a select/multi-select cell value.",
+    id_fields: ["rem_id", "property_id", "option_ids", "option_ids[]"]
+  },
+  set_cell_checkbox: {
+    op_type: "set_cell_checkbox",
+    aliases: ["cell.setCheckbox"],
+    payload: { required: ["rem_id", "property_id", "value"], optional: [] },
+    description: "Set a checkbox cell value.",
+    id_fields: ["rem_id", "property_id"]
+  },
+  set_cell_number: {
+    op_type: "set_cell_number",
+    aliases: ["cell.setNumber"],
+    payload: { required: ["rem_id", "property_id", "value"], optional: [] },
+    description: "Set a number cell value.",
+    id_fields: ["rem_id", "property_id"]
+  },
+  set_cell_date: {
+    op_type: "set_cell_date",
+    aliases: ["cell.setDate"],
+    payload: { required: ["rem_id", "property_id", "value"], optional: [] },
+    description: "Set a date cell value (requires the Daily doc to exist).",
+    id_fields: ["rem_id", "property_id"]
+  },
+  add_source: {
+    op_type: "add_source",
+    aliases: ["source.add"],
+    payload: { required: ["rem_id", "source_id"], optional: [] },
+    description: "Add a source link to a Rem.",
+    id_fields: ["rem_id", "source_id"]
+  },
+  remove_source: {
+    op_type: "remove_source",
+    aliases: ["source.remove"],
+    payload: { required: ["rem_id", "source_id"], optional: [] },
+    description: "Remove a source link from a Rem.",
+    id_fields: ["rem_id", "source_id"]
+  },
+  set_todo_status: {
+    op_type: "set_todo_status",
+    aliases: ["todo.setStatus"],
+    payload: { required: ["rem_id", "status"], optional: [] },
+    description: "Set todo completion status.",
+    id_fields: ["rem_id"]
+  }
+};
+
+// src/kernel/op-catalog/normalize.ts
+function normalizeOpTypeInput(opTypeRaw) {
+  return typeof opTypeRaw === "string" ? opTypeRaw.trim() : "";
+}
+var OP_ALIAS_TO_TYPE = Object.freeze(Object.fromEntries(Object.entries(OP_CATALOG).flatMap(([type2, entry]) => {
+  const aliases = Array.isArray(entry.aliases) ? entry.aliases : [];
+  return aliases.map((alias) => [alias, type2]);
+})));
+function canonicalizeOpType(opTypeRaw) {
+  const opType = normalizeOpTypeInput(opTypeRaw);
+  if (!opType)
+    return "";
+  if (OP_CATALOG[opType])
+    return opType;
+  return OP_ALIAS_TO_TYPE[opType] ?? opType;
+}
+
 // src/kernel/conflicts/deriveConflictKeys.ts
 function asNonEmptyString(value8) {
   if (typeof value8 !== "string")
@@ -75310,7 +75561,7 @@ function isStructureOp(opType) {
   return opType === "move_rem" || opType === "delete_rem" || opType === "replace_selection_with_markdown";
 }
 function deriveConflictKeys(opTypeRaw, payload) {
-  const opType = typeof opTypeRaw === "string" ? opTypeRaw.trim() : "";
+  const opType = canonicalizeOpType(opTypeRaw);
   const p3 = payload && typeof payload === "object" ? payload : null;
   const keys8 = [];
   if (opType === "daily_note_write") {
@@ -75319,6 +75570,7 @@ function deriveConflictKeys(opTypeRaw, payload) {
   }
   const remId = getFirstString(p3, ["rem_id", "remId"]);
   const parentId = getFirstString(p3, ["parent_id", "parentId"]);
+  const newParentId = getFirstString(p3, ["new_parent_id", "newParentId"]);
   const toParentId = getFirstString(p3, ["to_parent_id", "toParentId", "target_parent_id", "targetParentId"]);
   const fromParentId = getFirstString(p3, ["from_parent_id", "fromParentId"]);
   if (opType === "create_portal") {
@@ -75347,7 +75599,7 @@ function deriveConflictKeys(opTypeRaw, payload) {
   if (isStructureOp(opType)) {
     if (remId)
       keys8.push(`rem:${remId}`);
-    const parents = [parentId, toParentId, fromParentId].filter((x) => typeof x === "string" && x.length > 0);
+    const parents = [parentId, newParentId, toParentId, fromParentId].filter((x) => typeof x === "string" && x.length > 0);
     for (const pid of parents)
       keys8.push(`children:${pid}`);
     if (!remId && parents.length === 0) {
@@ -75595,7 +75847,7 @@ function ackSuccess(db, params3) {
       return { ok: false, op_id: params3.opId, attempt_id: params3.attemptId, reason: "invalid_attempt", current: cur };
     }
     const res = db.prepare(`UPDATE queue_ops
-         SET status='succeeded', updated_at=@t
+         SET status='succeeded', locked_at=NULL, lease_expires_at=NULL, updated_at=@t
          WHERE op_id=@op_id AND status='in_flight' AND locked_by=@locked_by AND attempt_id=@attempt_id`).run({ t, op_id: params3.opId, locked_by: params3.lockedBy, attempt_id: params3.attemptId });
     if (res.changes === 0) {
       return { ok: false, op_id: params3.opId, attempt_id: params3.attemptId, reason: "stale_ack", current: cur };
@@ -75627,7 +75879,7 @@ function ackSuccess(db, params3) {
 function ackRetry(db, params3) {
   const t = nowMs();
   const trx = db.transaction(() => {
-    const current2 = db.prepare(`SELECT status, attempt_id, locked_by, attempt_count, max_attempts FROM queue_ops WHERE op_id=?`).get(params3.opId);
+    const current2 = db.prepare(`SELECT txn_id, status, attempt_id, locked_by, attempt_count, max_attempts FROM queue_ops WHERE op_id=?`).get(params3.opId);
     if (!current2) {
       return { ok: false, op_id: params3.opId, attempt_id: params3.attemptId, reason: "not_found" };
     }
@@ -75636,13 +75888,54 @@ function ackRetry(db, params3) {
       attempt_id: current2.attempt_id ?? null,
       locked_by: current2.locked_by ?? null
     };
-    if (cur.attempt_id === params3.attemptId && cur.locked_by === params3.lockedBy && cur.status === "pending") {
+    if (cur.attempt_id === params3.attemptId && cur.locked_by === params3.lockedBy && (cur.status === "pending" || cur.status === "dead")) {
       return { ok: true, op_id: params3.opId, attempt_id: params3.attemptId, duplicate: true };
     }
     if (cur.attempt_id !== params3.attemptId) {
       return { ok: false, op_id: params3.opId, attempt_id: params3.attemptId, reason: "invalid_attempt", current: cur };
     }
     const attempt2 = Number(current2.attempt_count ?? 0) + 1;
+    const maxAttemptsRaw = Number(current2.max_attempts ?? 10);
+    const maxAttempts = Number.isFinite(maxAttemptsRaw) && maxAttemptsRaw > 0 ? Math.floor(maxAttemptsRaw) : 10;
+    if (attempt2 >= maxAttempts) {
+      const reason = params3.error.message ?? params3.error.code ?? "max attempts exceeded";
+      const res2 = db.prepare(`UPDATE queue_ops
+           SET status='dead',
+               attempt_count=@attempt,
+               dead_reason=@reason,
+               locked_at=NULL,
+               lease_expires_at=NULL,
+               updated_at=@t
+           WHERE op_id=@op_id AND status='in_flight' AND locked_by=@locked_by AND attempt_id=@attempt_id`).run({
+        attempt: attempt2,
+        reason,
+        t,
+        op_id: params3.opId,
+        locked_by: params3.lockedBy,
+        attempt_id: params3.attemptId
+      });
+      if (res2.changes === 0) {
+        return { ok: false, op_id: params3.opId, attempt_id: params3.attemptId, reason: "stale_ack", current: cur };
+      }
+      db.prepare(`INSERT OR REPLACE INTO queue_op_results(op_id, error_code, error_message, finished_at) VALUES(@op_id, @code, @message, @t)`).run({ op_id: params3.opId, code: params3.error.code ?? null, message: params3.error.message ?? null, t });
+      upsertOpAttempt(db, {
+        opId: params3.opId,
+        attemptId: params3.attemptId,
+        connId: params3.lockedBy,
+        status: "dead",
+        detail: {
+          acked_at: t,
+          retry_after_ms: null,
+          max_attempts: maxAttempts,
+          exhausted_at_attempt: attempt2
+        }
+      });
+      db.prepare(`UPDATE queue_txns SET status='failed', finished_at=@t, updated_at=@t WHERE txn_id=@txn_id`).run({
+        t,
+        txn_id: String(current2.txn_id)
+      });
+      return { ok: true, op_id: params3.opId, attempt_id: params3.attemptId, duplicate: false };
+    }
     const base = Math.min(60000, Math.pow(2, attempt2) * 1000);
     const jitter = Math.round(base * (0.1 + Math.random() * 0.2));
     const delay3 = params3.error.retryAfterMs ?? base + jitter;
@@ -75651,6 +75944,7 @@ function ackRetry(db, params3) {
          SET status='pending',
              attempt_count=@attempt,
              next_attempt_at=@next,
+             locked_at=NULL,
              lease_expires_at=NULL,
              updated_at=@t
          WHERE op_id=@op_id AND status='in_flight' AND locked_by=@locked_by AND attempt_id=@attempt_id`).run({ attempt: attempt2, next: next4, t, op_id: params3.opId, locked_by: params3.lockedBy, attempt_id: params3.attemptId });
@@ -75689,7 +75983,7 @@ function ackDead(db, params3) {
     }
     const reason = params3.error.message ?? params3.error.code ?? "dead";
     const res = db.prepare(`UPDATE queue_ops
-         SET status='dead', dead_reason=@reason, lease_expires_at=NULL, updated_at=@t
+         SET status='dead', dead_reason=@reason, locked_at=NULL, lease_expires_at=NULL, updated_at=@t
          WHERE op_id=@op_id AND status='in_flight' AND locked_by=@locked_by AND attempt_id=@attempt_id`).run({ reason, t, op_id: params3.opId, locked_by: params3.lockedBy, attempt_id: params3.attemptId });
     if (res.changes === 0) {
       return { ok: false, op_id: params3.opId, attempt_id: params3.attemptId, reason: "stale_ack", current: cur };
@@ -75787,8 +76081,12 @@ function getRemoteIdsByClientTempIds(db, clientTempIds) {
   return out;
 }
 function queueStats(db) {
+  const now2 = nowMs();
   const q = (sql) => db.prepare(sql).get();
-  const pending2 = q(`SELECT COUNT(1) as c FROM queue_ops WHERE status='pending' AND next_attempt_at<=${nowMs()}`)?.c ?? 0;
+  const pending2 = q(`SELECT COUNT(1) as c
+       FROM queue_ops o
+       JOIN queue_txns x ON x.txn_id = o.txn_id
+       WHERE o.status='pending' AND o.next_attempt_at<=${now2} AND x.status IN ('ready','in_progress')`)?.c ?? 0;
   const in_flight = q(`SELECT COUNT(1) as c FROM queue_ops WHERE status='in_flight'`)?.c ?? 0;
   const dead = q(`SELECT COUNT(1) as c FROM queue_ops WHERE status='dead'`)?.c ?? 0;
   const ready_txns = q(`SELECT COUNT(1) as c FROM queue_txns WHERE status IN ('ready','in_progress')`)?.c ?? 0;
@@ -76269,278 +76567,71 @@ function handleOpAckMessage(params3) {
   actions.push({ _tag: "SendJson", connId: params3.connId, msg: { type: "AckOk", ok: true, op_id: opId, attempt_id: attemptId } });
   return { actions, touchAckTimestamp: true, invalidateStatusLineReason: "op_acked" };
 }
-
-// src/kernel/op-catalog/catalog.ts
-var OP_CATALOG = {
-  create_rem: {
-    op_type: "create_rem",
-    aliases: ["rem.create"],
-    payload: {
-      required: ["parent_id"],
-      optional: ["text", "tags", "is_document", "position", "client_temp_id"]
-    },
-    description: "Create a Rem (parent required).",
-    id_fields: ["parent_id", "tags[]"]
-  },
-  create_portal: {
-    op_type: "create_portal",
-    aliases: ["portal.create", "rem.createPortal"],
-    payload: {
-      required: ["parent_id", "target_rem_id"],
-      optional: ["position", "client_temp_id"]
-    },
-    description: "Create a portal under parent that directly includes target_rem_id.",
-    id_fields: ["parent_id", "target_rem_id"]
-  },
-  create_link_rem: {
-    op_type: "create_link_rem",
-    aliases: ["rem.createLink"],
-    payload: {
-      required: ["url", "parent_id"],
-      optional: ["add_title", "client_temp_id"]
-    },
-    description: "Create a link Rem (parent required).",
-    id_fields: ["parent_id"]
-  },
-  update_text: {
-    op_type: "update_text",
-    aliases: ["rem.updateText"],
-    payload: { required: ["rem_id", "text"], optional: [] },
-    description: "Update Rem text.",
-    id_fields: ["rem_id"]
-  },
-  move_rem: {
-    op_type: "move_rem",
-    aliases: ["rem.move"],
-    payload: { required: ["rem_id", "new_parent_id"], optional: ["position"] },
-    description: "Move a Rem to a new parent.",
-    id_fields: ["rem_id", "new_parent_id"]
-  },
-  delete_rem: {
-    op_type: "delete_rem",
-    aliases: ["rem.delete"],
-    payload: { required: ["rem_id"], optional: [] },
-    description: "Delete a Rem.",
-    id_fields: ["rem_id"]
-  },
-  create_single_rem_with_markdown: {
-    op_type: "create_single_rem_with_markdown",
-    aliases: ["rem.createSingleWithMarkdown"],
-    payload: { required: ["parent_id", "markdown"], optional: ["client_temp_id"] },
-    description: "Create a single Rem from Markdown (parent required).",
-    id_fields: ["parent_id"]
-  },
-  create_tree_with_markdown: {
-    op_type: "create_tree_with_markdown",
-    aliases: ["rem.createTreeWithMarkdown"],
-    payload: {
-      required: ["parent_id", "markdown"],
-      optional: [
-        "position",
-        "indent_mode",
-        "indent_size",
-        "parse_mode",
-        "prepared",
-        "client_temp_ids",
-        "bundle"
-      ]
-    },
-    description: "Create a tree from Markdown (parent required).",
-    id_fields: ["parent_id"]
-  },
-  replace_selection_with_markdown: {
-    op_type: "replace_selection_with_markdown",
-    payload: {
-      required: ["markdown"],
-      optional: ["target", "require_same_parent", "require_contiguous", "portal_id"]
-    },
-    description: "Replace a selection of Rems with Markdown.",
-    id_fields: ["target.rem_ids[]", "portal_id"]
-  },
-  daily_note_write: {
-    op_type: "daily_note_write",
-    payload: {
-      required: [],
-      optional: ["text", "markdown", "date", "offset_days", "prepend", "position", "bundle"]
-    },
-    description: "Write to Daily Note.",
-    id_fields: []
-  },
-  add_tag: {
-    op_type: "add_tag",
-    aliases: ["tag.add"],
-    payload: { required: ["rem_id", "tag_id"], optional: [] },
-    description: "Add a tag to a Rem.",
-    id_fields: ["rem_id", "tag_id"]
-  },
-  remove_tag: {
-    op_type: "remove_tag",
-    aliases: ["tag.remove"],
-    payload: { required: ["rem_id", "tag_id"], optional: ["remove_properties"] },
-    description: "Remove a tag from a Rem.",
-    id_fields: ["rem_id", "tag_id"]
-  },
-  set_attribute: {
-    op_type: "set_attribute",
-    aliases: ["attribute.set"],
-    payload: { required: ["rem_id", "property_id"], optional: ["value"] },
-    description: "Set an attribute value (RichText).",
-    id_fields: ["rem_id", "property_id"]
-  },
-  table_cell_write: {
-    op_type: "table_cell_write",
-    aliases: ["table.cellWrite"],
-    payload: { required: ["rem_id", "property_id"], optional: ["value"] },
-    description: "Write text/RichText into a table cell (alias of set_attribute).",
-    id_fields: ["rem_id", "property_id"]
-  },
-  create_table: {
-    op_type: "create_table",
-    aliases: ["table.create"],
-    payload: { required: ["parent_id"], optional: ["tag_id", "position", "client_temp_id"] },
-    description: "Create a table (parent required; optional header Tag).",
-    id_fields: ["parent_id", "tag_id"]
-  },
-  add_property: {
-    op_type: "add_property",
-    aliases: ["property.add"],
-    payload: { required: ["tag_id"], optional: ["name", "property_id", "type", "options"] },
-    description: "Add a property under a table header Tag.",
-    id_fields: ["tag_id"]
-  },
-  set_property_type: {
-    op_type: "set_property_type",
-    aliases: ["property.setType"],
-    payload: { required: ["property_id", "type"], optional: [] },
-    description: "Set property type.",
-    id_fields: ["property_id"]
-  },
-  set_table_filter: {
-    op_type: "set_table_filter",
-    aliases: ["table.setFilter"],
-    payload: { required: ["table_id"], optional: ["column_id", "contains_text", "expr"] },
-    description: "Set a table filter (Query expression).",
-    id_fields: ["table_id", "column_id"]
-  },
-  add_option: {
-    op_type: "add_option",
-    aliases: ["option.add"],
-    payload: { required: ["property_id", "text"], optional: ["option_id"] },
-    description: "Add an option under a property.",
-    id_fields: ["property_id"]
-  },
-  remove_option: {
-    op_type: "remove_option",
-    aliases: ["option.remove"],
-    payload: { required: ["option_id"], optional: [] },
-    description: "Remove an option.",
-    id_fields: ["option_id"]
-  },
-  table_add_row: {
-    op_type: "table_add_row",
-    aliases: ["table.addRow"],
-    payload: {
-      required: ["table_tag_id"],
-      optional: ["parent_id", "rem_id", "text", "client_temp_id", "values", "extra_tags"]
-    },
-    description: "Add a row to a table (tag a Rem, optionally creating a new one).",
-    id_fields: ["table_tag_id", "parent_id", "rem_id", "extra_tags[]"]
-  },
-  table_remove_row: {
-    op_type: "table_remove_row",
-    aliases: ["table.removeRow"],
-    payload: { required: ["table_tag_id", "rem_id"], optional: ["remove_properties"] },
-    description: "Remove a row tag from a table.",
-    id_fields: ["table_tag_id", "rem_id"]
-  },
-  set_cell_select: {
-    op_type: "set_cell_select",
-    aliases: ["cell.setSelect"],
-    payload: { required: ["rem_id", "property_id", "option_ids"], optional: [] },
-    description: "Set a select/multi-select cell value.",
-    id_fields: ["rem_id", "property_id", "option_ids", "option_ids[]"]
-  },
-  set_cell_checkbox: {
-    op_type: "set_cell_checkbox",
-    aliases: ["cell.setCheckbox"],
-    payload: { required: ["rem_id", "property_id", "value"], optional: [] },
-    description: "Set a checkbox cell value.",
-    id_fields: ["rem_id", "property_id"]
-  },
-  set_cell_number: {
-    op_type: "set_cell_number",
-    aliases: ["cell.setNumber"],
-    payload: { required: ["rem_id", "property_id", "value"], optional: [] },
-    description: "Set a number cell value.",
-    id_fields: ["rem_id", "property_id"]
-  },
-  set_cell_date: {
-    op_type: "set_cell_date",
-    aliases: ["cell.setDate"],
-    payload: { required: ["rem_id", "property_id", "value"], optional: [] },
-    description: "Set a date cell value (requires the Daily doc to exist).",
-    id_fields: ["rem_id", "property_id"]
-  },
-  add_source: {
-    op_type: "add_source",
-    aliases: ["source.add"],
-    payload: { required: ["rem_id", "source_id"], optional: [] },
-    description: "Add a source link to a Rem.",
-    id_fields: ["rem_id", "source_id"]
-  },
-  remove_source: {
-    op_type: "remove_source",
-    aliases: ["source.remove"],
-    payload: { required: ["rem_id", "source_id"], optional: [] },
-    description: "Remove a source link from a Rem.",
-    id_fields: ["rem_id", "source_id"]
-  },
-  set_todo_status: {
-    op_type: "set_todo_status",
-    aliases: ["todo.setStatus"],
-    payload: { required: ["rem_id", "status"], optional: [] },
-    description: "Set todo completion status.",
-    id_fields: ["rem_id"]
+// src/kernel/op-catalog/idFields.ts
+function idFieldPathsForOpType(opTypeRaw) {
+  const opType = canonicalizeOpType(opTypeRaw);
+  const entry = OP_CATALOG[opType];
+  if (!entry)
+    return [];
+  return Array.isArray(entry.id_fields) ? entry.id_fields : [];
+}
+// src/kernel/op-catalog/pathWalk.ts
+function parsePathTokens(path11) {
+  return path11.split(".").map((part) => part.trim()).filter(Boolean).map((part) => {
+    const isArray2 = part.endsWith("[]");
+    const key = isArray2 ? part.slice(0, -2).trim() : part;
+    return { key, isArray: isArray2 };
+  }).filter((token) => token.key.length > 0);
+}
+function collectLeafValues(value8, path11, idx = 0) {
+  if (idx >= path11.length)
+    return [value8];
+  if (!value8 || typeof value8 !== "object")
+    return [];
+  const token = path11[idx];
+  const next4 = value8[token.key];
+  if (token.isArray) {
+    if (!Array.isArray(next4))
+      return [];
+    const out = [];
+    for (const item of next4) {
+      out.push(...collectLeafValues(item, path11, idx + 1));
+    }
+    return out;
+  }
+  return collectLeafValues(next4, path11, idx + 1);
+}
+function mapLeafValuesInPlace(value8, path11, mapFn, idx = 0) {
+  if (idx >= path11.length)
+    return;
+  if (!value8 || typeof value8 !== "object")
+    return;
+  const token = path11[idx];
+  const isLeaf = idx === path11.length - 1;
+  if (token.isArray) {
+    const next4 = value8[token.key];
+    if (!Array.isArray(next4))
+      return;
+    if (isLeaf) {
+      value8[token.key] = next4.map((item) => mapFn(item));
+      return;
+    }
+    for (const item of next4) {
+      mapLeafValuesInPlace(item, path11, mapFn, idx + 1);
+    }
+    return;
   }
-};
-// src/kernel/op-catalog/idFields.ts
-function idFieldPathsForOpType(opTypeRaw) {
-  const opType = typeof opTypeRaw === "string" ? opTypeRaw.trim() : "";
-  const entry = OP_CATALOG[opType];
-  if (!entry)
-    return [];
-  return Array.isArray(entry.id_fields) ? entry.id_fields : [];
+  if (isLeaf) {
+    value8[token.key] = mapFn(value8[token.key]);
+    return;
+  }
+  mapLeafValuesInPlace(value8[token.key], path11, mapFn, idx + 1);
 }
+
 // src/kernel/op-catalog/substituteIds.ts
 function isTempId(value8) {
   return typeof value8 === "string" && value8.trim().startsWith("tmp:");
 }
-function parsePath(path11) {
-  const array10 = path11.endsWith("[]");
-  const raw4 = array10 ? path11.slice(0, -2) : path11;
-  const segments = raw4.split(".").filter(Boolean);
-  return { segments, array: array10 };
-}
-function getAt2(root, segments) {
-  let cur = root;
-  for (const k of segments) {
-    if (!cur || typeof cur !== "object")
-      return;
-    cur = cur[k];
-  }
-  return cur;
-}
-function setAt(root, segments, value8) {
-  let cur = root;
-  for (let i = 0;i < segments.length - 1; i += 1) {
-    const k = segments[i];
-    const next4 = cur[k];
-    if (!next4 || typeof next4 !== "object")
-      cur[k] = {};
-    cur = cur[k];
-  }
-  cur[segments[segments.length - 1]] = value8;
-}
 function cloneJson(value8) {
   if (value8 == null || typeof value8 !== "object")
     return value8;
@@ -76556,19 +76647,14 @@ function collectTempIdsFromPayload(opTypeRaw, payload) {
   if (!payload || typeof payload !== "object")
     return [];
   const out = [];
-  for (const p3 of idFieldPathsForOpType(opTypeRaw)) {
-    const parsed = parsePath(p3);
-    const current2 = getAt2(payload, parsed.segments);
-    if (parsed.array) {
-      if (!Array.isArray(current2))
-        continue;
-      for (const v of current2) {
-        if (isTempId(v) && !out.includes(v.trim()))
-          out.push(v.trim());
-      }
-    } else {
-      if (isTempId(current2) && !out.includes(current2.trim()))
-        out.push(current2.trim());
+  for (const path11 of idFieldPathsForOpType(opTypeRaw)) {
+    const tokens = parsePathTokens(path11);
+    if (tokens.length === 0)
+      continue;
+    const values5 = collectLeafValues(payload, tokens);
+    for (const value8 of values5) {
+      if (isTempId(value8) && !out.includes(value8.trim()))
+        out.push(value8.trim());
     }
   }
   return out;
@@ -76577,26 +76663,16 @@ function substituteTempIdsInPayload(opTypeRaw, payload, idMap) {
   if (!payload || typeof payload !== "object")
     return payload;
   const out = cloneJson(payload);
-  for (const p3 of idFieldPathsForOpType(opTypeRaw)) {
-    const parsed = parsePath(p3);
-    const current2 = getAt2(out, parsed.segments);
-    if (parsed.array) {
-      if (!Array.isArray(current2))
-        continue;
-      const next4 = current2.map((v) => {
-        if (!isTempId(v))
-          return v;
-        const mapped = idMap[v.trim()];
-        return mapped ? mapped : v;
-      });
-      setAt(out, parsed.segments, next4);
-    } else {
-      if (!isTempId(current2))
-        continue;
-      const mapped = idMap[current2.trim()];
-      if (mapped)
-        setAt(out, parsed.segments, mapped);
-    }
+  for (const path11 of idFieldPathsForOpType(opTypeRaw)) {
+    const tokens = parsePathTokens(path11);
+    if (tokens.length === 0)
+      continue;
+    mapLeafValuesInPlace(out, tokens, (value8) => {
+      if (!isTempId(value8))
+        return value8;
+      const mapped = idMap[value8.trim()];
+      return mapped ? mapped : value8;
+    });
   }
   return out;
 }
@@ -77899,8 +77975,8 @@ function getTimezoneOffsetInMilliseconds(date6) {
 
 // ../../node_modules/date-fns/_lib/normalizeDates.js
 function normalizeDates(context8, ...dates) {
-  const normalize2 = constructFrom.bind(null, context8 || dates.find((date6) => typeof date6 === "object"));
-  return dates.map(normalize2);
+  const normalize3 = constructFrom.bind(null, context8 || dates.find((date6) => typeof date6 === "object"));
+  return dates.map(normalize3);
 }
 
 // ../../node_modules/date-fns/startOfDay.js
@@ -91715,12 +91791,16 @@ function normalizeOp(raw4, normalizer) {
   if (!type2) {
     throw new CliError({ code: "INVALID_PAYLOAD", message: "op.type is required and must be a string", exitCode: 2 });
   }
+  const canonicalType = canonicalizeOpType(type2);
+  if (!canonicalType) {
+    throw new CliError({ code: "INVALID_PAYLOAD", message: "op.type is required and must be a string", exitCode: 2 });
+  }
   const payload = normalizer(raw4.payload ?? {});
   const idempotencyKey = typeof raw4.idempotencyKey === "string" ? raw4.idempotencyKey : typeof raw4.idempotency_key === "string" ? raw4.idempotency_key : undefined;
   const maxAttempts = typeof raw4.maxAttempts === "number" ? raw4.maxAttempts : typeof raw4.max_attempts === "number" ? raw4.max_attempts : undefined;
   const deliverAfterMs = typeof raw4.deliverAfterMs === "number" ? raw4.deliverAfterMs : typeof raw4.deliver_after_ms === "number" ? raw4.deliver_after_ms : undefined;
   return {
-    type: type2,
+    type: canonicalType,
     payload,
     idempotencyKey,
     maxAttempts,
@@ -93541,23 +93621,7 @@ function compileWritePlanV1(plan, params3) {
   }
   return { alias_map: aliasMap, ops };
 }
-// src/commands/plan/apply.ts
-function optionToUndefined16(opt) {
-  return isSome2(opt) ? opt.value : undefined;
-}
-function readOptionalText4(name) {
-  return text9(name).pipe(optional5, map34(optionToUndefined16));
-}
-var payload = text9("payload");
-var clientId5 = readOptionalText4("client-id");
-var idempotencyKey5 = readOptionalText4("idempotency-key");
-var metaSpec5 = readOptionalText4("meta");
-var priority5 = integer7("priority").pipe(optional5, map34(optionToUndefined16));
-var notify5 = boolean8("no-notify").pipe(map34((v) => !v));
-var ensureDaemon6 = boolean8("no-ensure-daemon").pipe(map34((v) => !v));
-var wait3 = boolean8("wait");
-var timeoutMs3 = integer7("timeout-ms").pipe(optional5, map34(optionToUndefined16));
-var pollMs3 = integer7("poll-ms").pipe(optional5, map34(optionToUndefined16));
+// src/commands/_resolveRefsInPayload.ts
 function shouldResolveRef(value8) {
   const s = value8.trim();
   if (!s)
@@ -93572,184 +93636,202 @@ function shouldResolveRef(value8) {
   const prefix2 = s.slice(0, idx).trim().toLowerCase();
   return prefix2 === "id" || prefix2 === "page" || prefix2 === "title" || prefix2 === "daily";
 }
-function parsePath2(path22) {
-  const array10 = path22.endsWith("[]");
-  const raw4 = array10 ? path22.slice(0, -2) : path22;
-  const segments = raw4.split(".").filter(Boolean);
-  return { segments, array: array10 };
+function resolveRefsInPayload(params3) {
+  return gen2(function* () {
+    const refs = yield* RefResolver;
+    const out = structuredClone(params3.payload);
+    const resolvedRefCache = new Map;
+    const idPaths = idFieldPathsForOpType(params3.opType);
+    for (const path22 of idPaths) {
+      const tokens = parsePathTokens(path22);
+      if (tokens.length === 0)
+        continue;
+      const leaves = collectLeafValues(out, tokens);
+      if (leaves.length === 0)
+        continue;
+      const mapped = yield* forEach9(leaves, (leaf) => gen2(function* () {
+        if (typeof leaf !== "string")
+          return leaf;
+        const refValue = leaf.trim();
+        if (!shouldResolveRef(refValue))
+          return leaf;
+        const cached4 = resolvedRefCache.get(refValue);
+        if (cached4)
+          return cached4;
+        const resolved = yield* refs.resolve(refValue);
+        resolvedRefCache.set(refValue, resolved);
+        return resolved;
+      }), { concurrency: 1 });
+      let idx = 0;
+      mapLeafValuesInPlace(out, tokens, () => mapped[idx++]);
+    }
+    return out;
+  });
 }
+
+// src/commands/_tempId.ts
 function makeUuidLike() {
   const g = globalThis;
   if (g.crypto && typeof g.crypto.randomUUID === "function")
     return String(g.crypto.randomUUID());
   return `${Date.now().toString(16)}-${Math.random().toString(16).slice(2)}-${Math.random().toString(16).slice(2)}`;
 }
-function getAt3(root, segments) {
-  let cur = root;
-  for (const k of segments) {
-    if (!cur || typeof cur !== "object")
-      return;
-    cur = cur[k];
-  }
-  return cur;
+function makeTempId() {
+  return `tmp:${makeUuidLike()}`;
 }
-function setAt2(root, segments, value8) {
-  let cur = root;
-  for (let i = 0;i < segments.length - 1; i += 1) {
-    const k = segments[i];
-    const next4 = cur[k];
-    if (!next4 || typeof next4 !== "object") {
-      cur[k] = {};
-    }
-    cur = cur[k];
-  }
-  cur[segments[segments.length - 1]] = value8;
+
+// src/commands/_writePlanCommand.ts
+function optionToUndefined16(opt) {
+  return isSome2(opt) ? opt.value : undefined;
 }
-function resolveRefsInPayload(params3) {
-  return gen2(function* () {
-    const refs = yield* RefResolver;
-    const out = structuredClone(params3.payload);
-    const idPaths = idFieldPathsForOpType(params3.opType);
-    for (const p3 of idPaths) {
-      const parsed = parsePath2(p3);
-      const current2 = getAt3(out, parsed.segments);
-      if (parsed.array) {
-        if (!Array.isArray(current2))
-          continue;
-        const next4 = [];
-        for (const v of current2) {
-          if (typeof v === "string" && shouldResolveRef(v)) {
-            next4.push(yield* refs.resolve(v));
-          } else {
-            next4.push(v);
-          }
-        }
-        setAt2(out, parsed.segments, next4);
-      } else {
-        if (typeof current2 === "string" && shouldResolveRef(current2)) {
-          setAt2(out, parsed.segments, yield* refs.resolve(current2));
-        }
-      }
-    }
-    return out;
-  });
+function readOptionalText4(name) {
+  return text9(name).pipe(optional5, map34(optionToUndefined16));
 }
-var planApplyCommand = exports_Command.make("apply", {
-  payload,
-  dryRun: boolean8("dry-run"),
-  notify: notify5,
-  ensureDaemon: ensureDaemon6,
-  wait: wait3,
-  timeoutMs: timeoutMs3,
-  pollMs: pollMs3,
-  priority: priority5,
-  clientId: clientId5,
-  idempotencyKey: idempotencyKey5,
-  meta: metaSpec5
-}, ({ payload: payload2, dryRun, notify: notify6, ensureDaemon: ensureDaemon7, wait: wait4, timeoutMs: timeoutMs4, pollMs: pollMs4, priority: priority6, clientId: clientId6, idempotencyKey: idempotencyKey6, meta }) => gen2(function* () {
-  if (!wait4 && (timeoutMs4 !== undefined || pollMs4 !== undefined)) {
-    return yield* fail8(new CliError({
-      code: "INVALID_ARGS",
-      message: "Use --wait to enable --timeout-ms/--poll-ms",
-      exitCode: 2
-    }));
-  }
-  if (dryRun && wait4) {
-    return yield* fail8(new CliError({
-      code: "INVALID_ARGS",
-      message: "--wait is not compatible with --dry-run",
-      exitCode: 2
-    }));
-  }
-  const payloadSvc = yield* Payload;
-  const raw4 = yield* payloadSvc.readJson(payload2);
-  const normalized = payloadSvc.normalizeKeys(raw4);
-  const plan = yield* try_3({
-    try: () => parseWritePlanV1(normalized),
-    catch: (e) => isCliError(e) ? e : new CliError({
-      code: "INVALID_PAYLOAD",
-      message: String(e?.message || "Invalid write plan payload"),
-      exitCode: 2
-    })
-  });
-  const compiled = yield* try_3({
-    try: () => compileWritePlanV1(plan, {
-      makeTempId: () => `tmp:${makeUuidLike()}`
-    }),
-    catch: (e) => isCliError(e) ? e : new CliError({
-      code: "INVALID_PAYLOAD",
-      message: String(e?.message || "Failed to compile write plan"),
-      exitCode: 2
-    })
-  });
-  const resolvedOps = yield* forEach9(compiled.ops, (op) => resolveRefsInPayload({ opType: op.type, payload: op.payload }).pipe(map17((payload3) => ({ ...op, payload: payload3 }))), { concurrency: 1 });
-  const normalizedOps = yield* try_3({
-    try: () => resolvedOps.map((o) => normalizeOp(o, payloadSvc.normalizeKeys)),
-    catch: (e) => isCliError(e) ? e : new CliError({
-      code: "INVALID_PAYLOAD",
-      message: "Failed to generate ops",
-      exitCode: 2,
-      details: { error: String(e?.message || e) }
-    })
-  });
-  const metaValue = meta ? yield* payloadSvc.readJson(meta) : undefined;
-  const metaForTxn = metaValue && typeof metaValue === "object" ? { ...metaValue, write_plan: { version: 1, alias_map: compiled.alias_map } } : { write_plan: { version: 1, alias_map: compiled.alias_map } };
-  if (dryRun) {
-    yield* writeSuccess({
-      data: {
-        dry_run: true,
-        op_count: normalizedOps.length,
-        alias_map: compiled.alias_map,
-        ops: resolvedOps,
-        meta: payloadSvc.normalizeKeys(metaForTxn)
-      },
-      md: [`- dry_run: true`, `- ops: ${normalizedOps.length}`, `- aliases: ${Object.keys(compiled.alias_map).length}`].join(`
-`)
+var payload = text9("payload");
+var clientId5 = readOptionalText4("client-id");
+var idempotencyKey5 = readOptionalText4("idempotency-key");
+var metaSpec5 = readOptionalText4("meta");
+var priority5 = integer7("priority").pipe(optional5, map34(optionToUndefined16));
+var notify5 = boolean8("no-notify").pipe(map34((v) => !v));
+var ensureDaemon6 = boolean8("no-ensure-daemon").pipe(map34((v) => !v));
+var wait3 = boolean8("wait");
+var timeoutMs3 = integer7("timeout-ms").pipe(optional5, map34(optionToUndefined16));
+var pollMs3 = integer7("poll-ms").pipe(optional5, map34(optionToUndefined16));
+function makeWritePlanCommand(config3) {
+  return exports_Command.make(config3.commandName, {
+    payload,
+    dryRun: boolean8("dry-run"),
+    notify: notify5,
+    ensureDaemon: ensureDaemon6,
+    wait: wait3,
+    timeoutMs: timeoutMs3,
+    pollMs: pollMs3,
+    priority: priority5,
+    clientId: clientId5,
+    idempotencyKey: idempotencyKey5,
+    meta: metaSpec5
+  }, ({ payload: payload2, dryRun, notify: notify6, ensureDaemon: ensureDaemon7, wait: wait4, timeoutMs: timeoutMs4, pollMs: pollMs4, priority: priority6, clientId: clientId6, idempotencyKey: idempotencyKey6, meta }) => gen2(function* () {
+    if (!wait4 && (timeoutMs4 !== undefined || pollMs4 !== undefined)) {
+      return yield* fail8(new CliError({
+        code: "INVALID_ARGS",
+        message: "Use --wait to enable --timeout-ms/--poll-ms",
+        exitCode: 2
+      }));
+    }
+    if (dryRun && wait4) {
+      return yield* fail8(new CliError({
+        code: "INVALID_ARGS",
+        message: "--wait is not compatible with --dry-run",
+        exitCode: 2
+      }));
+    }
+    const payloadSvc = yield* Payload;
+    const raw4 = yield* payloadSvc.readJson(payload2);
+    const normalized = payloadSvc.normalizeKeys(raw4);
+    const plan = yield* try_3({
+      try: () => parseWritePlanV1(normalized),
+      catch: (e) => isCliError(e) ? e : new CliError({
+        code: "INVALID_PAYLOAD",
+        message: String(e?.message || "Invalid write plan payload"),
+        exitCode: 2
+      })
     });
-    return;
-  }
-  const data = yield* enqueueOps({
-    ops: normalizedOps,
-    priority: priority6,
-    clientId: clientId6,
-    idempotencyKey: idempotencyKey6,
-    meta: metaForTxn,
-    notify: notify6,
-    ensureDaemon: ensureDaemon7
-  });
-  const waited = wait4 ? yield* waitForTxn({ txnId: data.txn_id, timeoutMs: timeoutMs4, pollMs: pollMs4 }) : null;
-  const out = waited ? { ...data, ...waited } : data;
-  const aliasMapForOutput = data.deduped === true ? yield* gen2(function* () {
-    const cfg = yield* AppConfig;
-    const queue = yield* Queue;
-    const inspected = yield* queue.inspect({ dbPath: cfg.storeDb, txnId: data.txn_id });
-    const metaJson = inspected?.txn?.meta_json;
-    let stored = undefined;
-    if (typeof metaJson === "string" && metaJson.trim()) {
-      try {
-        const parsedMeta = payloadSvc.normalizeKeys(JSON.parse(metaJson));
-        stored = parsedMeta?.write_plan?.alias_map;
-      } catch {}
+    const compiled = yield* try_3({
+      try: () => compileWritePlanV1(plan, {
+        makeTempId
+      }),
+      catch: (e) => isCliError(e) ? e : new CliError({
+        code: "INVALID_PAYLOAD",
+        message: String(e?.message || "Failed to compile write plan"),
+        exitCode: 2
+      })
+    });
+    const resolvedOps = yield* forEach9(compiled.ops, (op) => resolveRefsInPayload({ opType: op.type, payload: op.payload }).pipe(map17((payload3) => ({ ...op, payload: payload3 }))), { concurrency: 1 });
+    const normalizedOps = yield* try_3({
+      try: () => resolvedOps.map((o) => normalizeOp(o, payloadSvc.normalizeKeys)),
+      catch: (e) => isCliError(e) ? e : new CliError({
+        code: "INVALID_PAYLOAD",
+        message: "Failed to generate ops",
+        exitCode: 2,
+        details: { error: String(e?.message || e) }
+      })
+    });
+    const metaValue = meta ? yield* payloadSvc.readJson(meta) : undefined;
+    const metaForTxn = metaValue && typeof metaValue === "object" ? { ...metaValue, write_plan: { version: 1, alias_map: compiled.alias_map } } : { write_plan: { version: 1, alias_map: compiled.alias_map } };
+    if (dryRun) {
+      yield* writeSuccess({
+        data: {
+          dry_run: true,
+          op_count: normalizedOps.length,
+          alias_map: compiled.alias_map,
+          ops: resolvedOps,
+          meta: payloadSvc.normalizeKeys(metaForTxn)
+        },
+        md: [`- dry_run: true`, `- ops: ${normalizedOps.length}`, `- aliases: ${Object.keys(compiled.alias_map).length}`].join(`
+`)
+      });
+      return;
     }
-    return stored && typeof stored === "object" ? stored : compiled.alias_map;
-  }).pipe(catchAll2(() => succeed8(compiled.alias_map))) : compiled.alias_map;
-  yield* writeSuccess({
-    data: {
+    const data = yield* enqueueOps({
+      ops: normalizedOps,
+      priority: priority6,
+      clientId: clientId6,
+      idempotencyKey: idempotencyKey6,
+      meta: metaForTxn,
+      notify: notify6,
+      ensureDaemon: ensureDaemon7
+    });
+    const waited = wait4 ? yield* waitForTxn({ txnId: data.txn_id, timeoutMs: timeoutMs4, pollMs: pollMs4 }) : null;
+    const out = waited ? { ...data, ...waited } : data;
+    const aliasMapForOutput = data.deduped === true ? yield* gen2(function* () {
+      const cfg = yield* AppConfig;
+      const queue = yield* Queue;
+      const inspected = yield* queue.inspect({ dbPath: cfg.storeDb, txnId: data.txn_id });
+      const metaJson = inspected?.txn?.meta_json;
+      let stored = undefined;
+      if (typeof metaJson === "string" && metaJson.trim()) {
+        try {
+          const parsedMeta = payloadSvc.normalizeKeys(JSON.parse(metaJson));
+          stored = parsedMeta?.write_plan?.alias_map;
+        } catch {}
+      }
+      return stored && typeof stored === "object" ? stored : compiled.alias_map;
+    }).pipe(catchAll2(() => succeed8(compiled.alias_map))) : compiled.alias_map;
+    const successData = {
       ...out,
       alias_map: aliasMapForOutput
-    },
-    ids: [data.txn_id, ...data.op_ids],
-    md: [
-      `- txn_id: ${data.txn_id}`,
-      `- op_ids: ${data.op_ids.length}`,
-      `- notified: ${data.notified}`,
-      `- sent: ${data.sent ?? ""}`,
-      `- aliases: ${Object.keys(aliasMapForOutput).length}`,
-      ...waited ? [`- status: ${waited.status}`, `- elapsed_ms: ${waited.elapsed_ms}`] : []
-    ].join(`
+    };
+    if (config3.includeOpCountInSuccessData) {
+      successData.op_count = normalizedOps.length;
+    }
+    const mdLines = [`- txn_id: ${data.txn_id}`, `- op_ids: ${data.op_ids.length}`];
+    if (config3.aliasesBeforeNotifyInMd) {
+      mdLines.push(`- aliases: ${Object.keys(aliasMapForOutput).length}`);
+    }
+    mdLines.push(`- notified: ${data.notified}`);
+    mdLines.push(`- sent: ${data.sent ?? ""}`);
+    if (!config3.aliasesBeforeNotifyInMd) {
+      mdLines.push(`- aliases: ${Object.keys(aliasMapForOutput).length}`);
+    }
+    if (waited) {
+      mdLines.push(`- status: ${waited.status}`);
+      mdLines.push(`- elapsed_ms: ${waited.elapsed_ms}`);
+    }
+    yield* writeSuccess({
+      data: successData,
+      ids: [data.txn_id, ...data.op_ids],
+      md: mdLines.join(`
 `)
-  });
-}).pipe(catchAll2(writeFailure)));
+    });
+  }).pipe(catchAll2(writeFailure)));
+}
+
+// src/commands/plan/apply.ts
+var planApplyCommand = makeWritePlanCommand({
+  commandName: "apply",
+  includeOpCountInSuccessData: false,
+  aliasesBeforeNotifyInMd: false
+});
 
 // src/commands/plan/index.ts
 var planCommand = exports_Command.make("plan", {}).pipe(exports_Command.withSubcommands([planApplyCommand]));
@@ -95753,12 +95835,6 @@ var writePowerupPropertyCommand = exports_Command.make("property", {}).pipe(expo
 
 // src/commands/write/powerup/record/add.ts
 var dispatchMode2 = choice5("dispatch-mode", ["serial", "conflict_parallel"]).pipe(optional5, map34(optionToUndefined27));
-function makeUuidLike2() {
-  const g = globalThis;
-  if (g.crypto && typeof g.crypto.randomUUID === "function")
-    return String(g.crypto.randomUUID());
-  return `${Date.now().toString(16)}-${Math.random().toString(16).slice(2)}-${Math.random().toString(16).slice(2)}`;
-}
 var writePowerupRecordAddCommand = exports_Command.make("add", {
   tagId: text9("tag-id").pipe(optional5, map34(optionToUndefined27)),
   powerup: text9("powerup").pipe(optional5, map34(optionToUndefined27)),
@@ -95840,7 +95916,7 @@ var writePowerupRecordAddCommand = exports_Command.make("add", {
   const tableTagId = resolved ? resolved.id : normalizeRemIdInput(tagId);
   const resolvedRef = ref3 ?? "daily:today";
   const parentId = typeof parent3 === "string" ? parent3 : dryRun ? resolvedRef : yield* refs.resolve(resolvedRef);
-  const rowClientTempId = `tmp:${makeUuidLike2()}`;
+  const rowClientTempId = makeTempId();
   const rawValues = values5 ? yield* payloadSvc.readJson(values5) : undefined;
   const parsedValues = rawValues !== undefined ? yield* try_3({
     try: () => parseValuesArrayOnly(payloadSvc.normalizeKeys(rawValues)),
@@ -97012,12 +97088,6 @@ var readResolveRefCommand = exports_Command.make("resolve-ref", {
 }).pipe(catchAll2(writeFailure)));
 
 // src/commands/write/rem/create.ts
-function makeUuidLike3() {
-  const g = globalThis;
-  if (g.crypto && typeof g.crypto.randomUUID === "function")
-    return String(g.crypto.randomUUID());
-  return `${Date.now().toString(16)}-${Math.random().toString(16).slice(2)}-${Math.random().toString(16).slice(2)}`;
-}
 function normalizeRemIdInput2(raw4) {
   const trimmed2 = raw4.trim();
   const link3 = tryParseRemnoteLink(trimmed2);
@@ -97105,7 +97175,7 @@ var writeRemCreateCommand = exports_Command.make("create", {
   const resolvedRef = ref5 ?? "";
   const parentId = typeof parent3 === "string" ? normalizeRemIdInput2(parent3) : dryRun ? normalizeRemIdInput2(resolvedRef) : yield* refs.resolve(resolvedRef);
   const tags2 = Array.isArray(tag9) ? tag9.map(normalizeRemIdInput2).filter(Boolean) : [];
-  const remClientTempId = clientTempId ? String(clientTempId).trim() : `tmp:${makeUuidLike3()}`;
+  const remClientTempId = clientTempId ? String(clientTempId).trim() : makeTempId();
   const textValue = text16 !== undefined ? trimBoundaryBlankLines(text16) : undefined;
   const payload3 = {
     parentId,
@@ -97541,7 +97611,7 @@ function normalizeRemIdInput5(raw4) {
     return link3.remId;
   return trimmed2;
 }
-var writeRemTextCommand = exports_Command.make("text", {
+var writeRemSetTextCommand = exports_Command.make("set-text", {
   rem: text9("rem"),
   text: text9("text"),
   notify: writeCommonOptions.notify,
@@ -97621,7 +97691,7 @@ var writeRemTextCommand = exports_Command.make("text", {
 var remCommand = exports_Command.make("rem", {}).pipe(exports_Command.withSubcommands([
   writeRemCreateCommand,
   writeRemMoveCommand,
-  writeRemTextCommand,
+  writeRemSetTextCommand,
   writeRemTagCommand,
   writeRemDeleteCommand,
   readInspectCommand,
@@ -97772,7 +97842,7 @@ var ensureDaemon8 = boolean8("no-ensure-daemon").pipe(map34((v) => !v));
 var wait4 = boolean8("wait");
 var timeoutMs5 = integer7("timeout-ms").pipe(optional5, map34(optionToUndefined37));
 var pollMs4 = integer7("poll-ms").pipe(optional5, map34(optionToUndefined37));
-var replaceBlockCommand = exports_Command.make("block", {
+var replaceMarkdownCommand = exports_Command.make("markdown", {
   selection,
   stateFile: stateFile10,
   staleMs: staleMs9,
@@ -97856,7 +97926,7 @@ var replaceBlockCommand = exports_Command.make("block", {
   if (scopeValue !== "roots") {
     return yield* fail8(new CliError({
       code: "INVALID_ARGS",
-      message: "replace block does not support --scope subtree (block-level replace deletes roots and recursively deletes their subtrees)",
+      message: "replace markdown does not support --scope subtree (block-level replace deletes roots and recursively deletes their subtrees)",
       exitCode: 2
     }));
   }
@@ -98013,7 +98083,7 @@ function replaceRichText(value8, replacer) {
   }
   return { value: value8, changed: false };
 }
-var replaceTextCommand = exports_Command.make("text", {
+var replaceLiteralCommand = exports_Command.make("literal", {
   selection: selection2,
   stateFile: stateFile11,
   staleMs: staleMs10,
@@ -98211,7 +98281,7 @@ var replaceTextCommand = exports_Command.make("text", {
 }).pipe(catchAll2(writeFailure)));
 
 // src/commands/write/replace/index.ts
-var writeReplaceCommand = exports_Command.make("replace", {}).pipe(exports_Command.withSubcommands([replaceBlockCommand, replaceTextCommand]));
+var writeReplaceCommand = exports_Command.make("replace", {}).pipe(exports_Command.withSubcommands([replaceMarkdownCommand, replaceLiteralCommand]));
 
 // src/commands/replace/index.ts
 var replaceCommand = writeReplaceCommand;
@@ -98278,12 +98348,6 @@ var readSearchCommand = exports_Command.make("search", {
 var searchCommand = readSearchCommand;
 
 // src/commands/write/table/create.ts
-function makeUuidLike4() {
-  const g = globalThis;
-  if (g.crypto && typeof g.crypto.randomUUID === "function")
-    return String(g.crypto.randomUUID());
-  return `${Date.now().toString(16)}-${Math.random().toString(16).slice(2)}-${Math.random().toString(16).slice(2)}`;
-}
 function normalizeRemIdInput6(raw4) {
   const trimmed2 = raw4.trim();
   const link3 = tryParseRemnoteLink(trimmed2);
@@ -98373,7 +98437,7 @@ var writeTableCreateCommand = exports_Command.make("create", {
   }
   const resolvedRef = ref7 ?? "";
   const parentId2 = typeof parent3 === "string" ? normalizeRemIdInput6(parent3) : dryRun ? resolvedRef : yield* refs.resolve(resolvedRef);
-  const tableClientTempId = clientTempId ? String(clientTempId).trim() : `tmp:${makeUuidLike4()}`;
+  const tableClientTempId = clientTempId ? String(clientTempId).trim() : makeTempId();
   const op2 = yield* try_3({
     try: () => normalizeOp({
       type: "create_table",
@@ -98768,12 +98832,6 @@ var writeTablePropertySetTypeCommand = exports_Command.make("set-type", {
 var writeTablePropertyCommand = exports_Command.make("property", {}).pipe(exports_Command.withSubcommands([writeTablePropertyAddCommand, writeTablePropertySetTypeCommand]));
 
 // src/commands/write/table/record/add.ts
-function makeUuidLike5() {
-  const g = globalThis;
-  if (g.crypto && typeof g.crypto.randomUUID === "function")
-    return String(g.crypto.randomUUID());
-  return `${Date.now().toString(16)}-${Math.random().toString(16).slice(2)}-${Math.random().toString(16).slice(2)}`;
-}
 var writeTableRecordAddCommand = exports_Command.make("add", {
   tableTag: text9("table-tag"),
   parent: text9("parent").pipe(optional5, map34(optionToUndefined27)),
@@ -98839,7 +98897,7 @@ var writeTableRecordAddCommand = exports_Command.make("add", {
     details: e.details,
     hint: e.hint
   }))));
-  const rowClientTempId = `tmp:${makeUuidLike5()}`;
+  const rowClientTempId = makeTempId();
   const rawValues = values5 ? yield* payloadSvc.readJson(values5) : undefined;
   const parsedValues = rawValues !== undefined ? yield* try_3({
     try: () => parseValuesArrayOnly(payloadSvc.normalizeKeys(rawValues)),
@@ -99904,12 +99962,6 @@ var readTopicCommand = exports_Command.make("topic", {}).pipe(exports_Command.wi
 var topicCommand = readTopicCommand;
 
 // src/commands/write/portal/create.ts
-function makeUuidLike6() {
-  const g = globalThis;
-  if (g.crypto && typeof g.crypto.randomUUID === "function")
-    return String(g.crypto.randomUUID());
-  return `${Date.now().toString(16)}-${Math.random().toString(16).slice(2)}-${Math.random().toString(16).slice(2)}`;
-}
 function normalizeRemIdInput7(raw4) {
   const trimmed2 = raw4.trim();
   const link3 = tryParseRemnoteLink(trimmed2);
@@ -100003,7 +100055,7 @@ var writePortalCreateCommand = exports_Command.make("create", {
       exitCode: 2
     }));
   }
-  const portalClientTempId = clientTempId ? String(clientTempId).trim() : `tmp:${makeUuidLike6()}`;
+  const portalClientTempId = clientTempId ? String(clientTempId).trim() : makeTempId();
   const op2 = yield* try_3({
     try: () => normalizeOp({
       type: "create_portal",