things-api 0.14.0 → 0.16.0

package/dist/cli/commands/todo.js

@@ -7,6 +7,35 @@ import { runRead, withClient } from "../read-driver.js";
 import { DidYouMeanError } from "../did-you-mean.js";
 // The opened resource shows its tags green (GUI: list pills are gray).
 const tagList = (tags) => green(`#${tags.map((t) => t.title).join(" #")}`);
+/** The unit noun the after-completion caption phrases (singular; pluralized by the caller). */
+const REPEAT_UNIT_NOUN = {
+    daily: "day",
+    weekly: "week",
+    monthly: "month",
+    yearly: "year",
+};
+/**
+ * The GUI's lower-corner repeat caption for a repeating INSTANCE, from its
+ * template's joined context (src/read/detail.ts `repeats`): FIXED mode reads
+ * `on <date>` (the "Repeats on Aug 19" projection); after-completion reads
+ * `<N> <unit>(s) after completion` (the "Repeats 1 day after completion" form —
+ * N/unit are the rule's own interval + frequency, singular/plural correct).
+ * Returns null when the context carries no renderable caption (no decodable rule,
+ * or a fixed rule with no projected date). The `paused` flag is surfaced
+ * SEPARATELY so the caller can fold it into the merged `repeats:` line with the
+ * instance-of handle. See {@link renderDetail}.
+ */
+function repeatContextValue(ctx, todayIso) {
+    const rule = ctx.rule;
+    if (rule === undefined)
+        return null;
+    if (rule.type === "fixed") {
+        return ctx.next != null ? `on ${shortDate(ctx.next, todayIso)}` : null;
+    }
+    const noun = REPEAT_UNIT_NOUN[rule.unit] ?? rule.unit;
+    const n = rule.interval;
+    return `${n} ${noun}${n === 1 ? "" : "s"} after completion`;
+}
 /**
  * The detail card, project-card grammar: type-labeled title row (the box
  * carries open/completed/canceled; only `trashed` needs words), uri, then
@@ -29,7 +58,7 @@ export function renderDetail(item) {
     const todayIso = localToday(renderNow(), renderZone());
     const label = item.type === "to-do" ? "To-Do:" : "Project:";
     const box = item.type === "to-do" ? todoBox(item) : projectCircle(item);
-    const trashed = item.trashed ? ` ${red("(trashed)")}` : "";
+    const trashed = item.derived.trashed ? ` ${red("(trashed)")}` : "";
     const lines = [
         `${bold(label)} ${box} ${bold(item.title)}${trashed}`,
         `  ${dim("uri:")} ${thingsLink(item.uuid)}`,
@@ -83,8 +112,26 @@ export function renderDetail(item) {
         const state = item.repeating.nextOccurrence != null && st === "waiting" ? "scheduled" : st;
         meta("repeating", `TEMPLATE, ${state} (occurrences appear in upcoming)`);
     }
-    if (item.repeating.isInstance)
-        meta("repeating", `instance of ${item.repeating.templateUuid}`);
+    if (item.repeating.isInstance) {
+        // ONE merged line: the GUI's lower-corner caption plus the instance-of write
+        // handle, e.g. `repeats: on Aug 19 (instance of <uuid>)` /
+        // `repeats: 1 day after completion (instance of <uuid>)`; a paused template
+        // folds in as `(paused; instance of <uuid>)`. With no renderable caption
+        // (dangling FK / undecodable rule) the line is just `instance of <uuid>`
+        // (paused appended). JSON wire is unchanged (`instanceOf` + `repeats` stay
+        // separate keys, src/read/shape.ts).
+        const tmpl = item.repeating.templateUuid;
+        const instanceOf = `instance of ${tmpl}`;
+        const ctx = item.repeating.repeats;
+        const caption = ctx !== undefined ? repeatContextValue(ctx, todayIso) : null;
+        const paused = ctx?.paused === true;
+        if (caption !== null) {
+            meta("repeats", `${caption} (${paused ? "paused; " : ""}${instanceOf})`);
+        }
+        else {
+            meta("repeats", `${instanceOf}${paused ? dim(" (paused)") : ""}`);
+        }
+    }
     if (item.notes !== "")
         lines.push("", item.notes);
     if (item.type === "to-do" && item.checklist && item.checklist.length > 0) {

package/dist/cli/commands/todo.js.map

@@ -1 +1 @@
-{"version":3,"file":"todo.js","sourceRoot":"","sources":["../../../src/cli/commands/todo.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"todo.js","sourceRoot":"","sources":["../../../src/cli/commands/todo.ts"],"names":[],"mappings":"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"}

package/dist/cli/commands/writes.js

@@ -1,5 +1,5 @@
 import { readFileSync } from "node:fs";
-import { addRepeatRuleFlags, repeatRuleFlagsFromOpts } from "./repeat-flags.js";
+import { addRepeatCalendarFlags, addRepeatingRuleFieldsFromOpts, addRepeatRuleFlags, repeatRuleFlagsFromOpts, } from "./repeat-flags.js";
 import { aggregateExitCode, blockedCode, capabilitiesTable, ClockError, describeConfig, errorEnvelope, ExitCode, getConfigKey, mutationWireData, okEnvelope, openThings, OP_ID_RE, outcomeFailed, ReferenceResolutionError, saveConfigKey, splitWhenSugar, ThingsDbNotFoundError, ThingsDbOpenError, verifyFailedCode, } from "../../index.js";
 import { usageError } from "../read-driver.js";
 import { dim } from "../style.js";
@@ -8,6 +8,12 @@ function addWriteFlags(cmd) {
         .option("--json", "emit versioned JSON envelope on stdout")
         .option("--db <path>", "explicit database path")
         .option("--dry-run", "preview the planned change and its expected effect; nothing executes")
+        .option("--preserve-modified", "keep this change off the modification-date timeline: capture each pre-existing edited " +
+        "item's modification date and restore it (to the whole second) after the change, so a " +
+        "changes/watch query keyed on it does not surface the edit. A no-op on a pure create. " +
+        "Safe with Things Cloud: the restored date syncs to your other devices and stays put, so " +
+        "the item stays off the timeline everywhere — unless another device edits the same item " +
+        "at nearly the same time, which re-dates it.")
         .option("--vector <id>", "force how the change is delivered: url-scheme | applescript | shortcuts | ui")
         .option("--allow-disruptive", "permit changes that briefly steal window focus")
         .option("--allow-very-disruptive", "permit changes that visibly drive the Things UI")
@@ -88,6 +94,7 @@ function writeOptionsFrom(opts, extra = {}) {
         ...(opts.actor !== undefined && { actor: opts.actor }),
         ...(opts.dangerouslyDriveGui === true && { dangerouslyDriveGui: true }),
         ...(opts.opId !== undefined && { opId: opts.opId }),
+        ...(opts.preserveModified === true && { preserveModified: true }),
         ...extra,
     };
 }
@@ -234,6 +241,23 @@ async function runWrite(opts, fn, emitFn = emitResult) {
         client?.close();
     }
 }
+/**
+ * TTY disclosure for `--preserve-modified` on a verified ok result: a dim line
+ * naming how many pre-existing rows' modification date was restored (kept off
+ * the `changes`/watch timeline), plus a stderr warning per row the best-effort
+ * restore could not neutralize. Silent when the flag did no work (the field is
+ * absent — a pure create, or an already-silent op).
+ */
+function emitPreserveNote(result) {
+    if (result.preservedModified === undefined)
+        return;
+    const failed = result.preserveFailures ?? [];
+    const tail = failed.length > 0 ? `; ${failed.length} could not be restored (see warnings)` : "";
+    process.stdout.write(dim(`  preserved modification date on ${result.preservedModified} item(s) — kept off the changes timeline${tail}\n`));
+    for (const f of failed) {
+        process.stderr.write(`warning: preserve-modified: ${f.uuid}: ${f.detail}\n`);
+    }
+}
 function emitResult(result, opts, meta) {
     switch (result.kind) {
         case "bounce-aborted": {
@@ -265,6 +289,7 @@ function emitResult(result, opts, meta) {
                     ? "already applied — matched op-id in the change history, not re-run"
                     : `vector=${result.vector}, tier=${result.tier}, verified`;
                 process.stdout.write(`ok ${result.op}${uuid} (${status})\n`);
+                emitPreserveNote(result);
             }
             process.exitCode = ExitCode.Ok;
             return;
@@ -680,6 +705,11 @@ function group(program, name, description) {
     return program.command(name).description(description);
 }
 const containerRef = (value) => value === undefined ? undefined : { uuid: value, title: value };
+/** The clone-specific args (`--title` / `--preserve-created`) for todo/project clone. */
+const cloneArgs = (opts) => ({
+    ...(opts["title"] !== undefined && { title: opts["title"] }),
+    ...(opts["preserveCreated"] === true && { preserveCreated: true }),
+});
 export function registerWriteCommands(program) {
     const todo = group(program, "todo", "To-do–scoped operations");
     addCreateTagsFlag(addWriteFlags(todo
@@ -921,6 +951,21 @@ export function registerWriteCommands(program) {
         "available for repeating to-dos.")).action(async (uuid, opts) => {
         await runWrite(opts, (c) => c.write.duplicateTodo(uuid, writeOptionsFrom(opts)));
     });
+    addDriveGuiFlag(addWriteFlags(todo
+        .command("clone <uuid>")
+        .description("Clone a to-do — a faithful content copy (title, notes, tags, when, reminder, deadline, " +
+        "checklist items and their checked state, container, and completed/canceled state with " +
+        "the exact original timestamp). The clone is a new capture: a new uuid, created now, at " +
+        "its container's usual position; the clone's uuid is printed on success. Refuses a " +
+        "trashed source (restore it first). A repeating template is cloned as a NEW repeating " +
+        "series (its content plus the source's rule, minted fresh — no instances copied); this " +
+        "drives the app (requires --dangerously-drive-gui) and refuses a rule the Repeat dialog " +
+        "cannot express. Undo trashes the clone (a template clone trashes the new series).")
+        .option("--title <text>", "give the clone a different title (default: the source's title)")
+        .option("--preserve-created", "copy the source's creation date onto the clone (minute resolution) instead of now"))).action(async (uuid, opts) => {
+        const clone = cloneArgs(opts);
+        await runWrite(opts, (c) => c.write.cloneTodo(uuid, clone, writeOptionsFrom(opts)));
+    });
     addCreateTagsFlag(addWriteFlags(todo
         .command("tags <uuid>")
         .description("Set or extend a to-do's tags. --set REPLACES the full tag set (an empty value " +
@@ -1042,36 +1087,39 @@ export function registerWriteCommands(program) {
     // --- ui vector: GUI-driven transforms (two-key gated) --------------------
     const REPEAT_FREQ_HELP = "daily | weekly | monthly | yearly";
     const REPEAT_INTERVAL_HELP = "every N units (1–99)";
-    for (const [verb, op, desc] of [
-        [
-            "make-repeating",
-            "todo.make-repeating",
-            "Turn a plain to-do into a repeating one. This REPLACES the to-do with a new repeating " +
-                "series — the original disappears and a fresh recurring item takes its place " +
-                "(cannot be undone). Set the rule with the flags below; see `things help repeating`.",
-        ],
-        [
-            "reschedule-repeat",
-            "todo.reschedule-repeat",
-            "Change an existing repeating to-do's rule in place (the item keeps its identity). Set the " +
-                "new rule with the flags below; see `things help repeating`. `things undo` restores the " +
-                "previous rule.",
-        ],
-    ]) {
-        addDriveGuiFlag(addRepeatRuleFlags(addWriteFlags(todo
-            .command(`${verb} <uuid>`)
-            .description(desc)
-            .requiredOption("--frequency <freq>", REPEAT_FREQ_HELP)
-            .requiredOption("--interval <n>", REPEAT_INTERVAL_HELP)))).action(async (uuid, opts) => {
-            const frequency = opts["frequency"];
-            await runWrite(opts, (c) => c.write.run(op, {
-                uuid,
-                frequency,
-                interval: Number(opts["interval"]),
-                ...repeatRuleFlagsFromOpts(opts, frequency),
-            }, writeOptionsFrom(opts)));
-        });
-    }
+    // make-repeating is promote-via-clone: a disposable copy is promoted and the
+    // ORIGINAL moves to the Trash, so `things undo` reverses it (removes the new
+    // series and restores the original).
+    addDriveGuiFlag(addRepeatRuleFlags(addWriteFlags(todo
+        .command("make-repeating <uuid>")
+        .description("Turn a plain to-do into a repeating one. A disposable copy is promoted and the " +
+        "ORIGINAL is moved to the Trash — so `things undo` reverses it (it removes the new " +
+        "series and restores the original). The new template's uuid is printed. Set the rule " +
+        "with the flags below; see `things help repeating`.")
+        .requiredOption("--frequency <freq>", REPEAT_FREQ_HELP)
+        .requiredOption("--interval <n>", REPEAT_INTERVAL_HELP)))).action(async (uuid, opts) => {
+        const frequency = opts["frequency"];
+        await runWrite(opts, (c) => c.write.makeRepeatingTodo(uuid, {
+            frequency,
+            interval: Number(opts["interval"]),
+            ...repeatRuleFlagsFromOpts(opts, frequency),
+        }, writeOptionsFrom(opts)));
+    });
+    addDriveGuiFlag(addRepeatRuleFlags(addWriteFlags(todo
+        .command("reschedule-repeat <uuid>")
+        .description("Change an existing repeating to-do's rule in place (the item keeps its identity). Set " +
+        "the new rule with the flags below; see `things help repeating`. `things undo` " +
+        "restores the previous rule.")
+        .requiredOption("--frequency <freq>", REPEAT_FREQ_HELP)
+        .requiredOption("--interval <n>", REPEAT_INTERVAL_HELP)))).action(async (uuid, opts) => {
+        const frequency = opts["frequency"];
+        await runWrite(opts, (c) => c.write.run("todo.reschedule-repeat", {
+            uuid,
+            frequency,
+            interval: Number(opts["interval"]),
+            ...repeatRuleFlagsFromOpts(opts, frequency),
+        }, writeOptionsFrom(opts)));
+    });
     for (const [verb, op, desc] of [
         [
             "pause-repeat",
@@ -1205,7 +1253,7 @@ export function registerWriteCommands(program) {
             return c.write.moveHeading({ uuid: proj.uuid }, headings, placement, writeOptionsFrom(opts));
         });
     });
-    addWriteFlags(project
+    addDriveGuiFlag(addWriteFlags(project
         .command("move-heading-to-project <project> <heading>")
         .requiredOption("--to <project>", "destination project (uuid or unique title)")
         .description("Move a heading — WITH its to-dos — to a DIFFERENT project. This is the cross-project " +
@@ -1215,14 +1263,14 @@ export function registerWriteCommands(program) {
         "once with `things config set ui.enabled true` and pass --dangerously-drive-gui. Fails " +
         "closed when the heading title is shared by another heading in the project, or the " +
         "destination title by another project (the drive addresses both by title). No undo — " +
-        "move it back to reverse.")).action(async (projectRef, sel, opts) => {
+        "move it back to reverse."))).action(async (projectRef, sel, opts) => {
         await runWrite(opts, (c) => {
             const proj = c.resolve.project(projectRef);
             const dest = c.resolve.project(String(opts["to"]));
             return c.write.moveHeadingToProject({ uuid: proj.uuid }, sel, { uuid: dest.uuid }, writeOptionsFrom(opts));
         });
     });
-    addWriteFlags(project
+    addDriveGuiFlag(addWriteFlags(project
         .command("dissolve-heading <project> <heading>")
         .description("Dissolve a heading — remove it but KEEP its to-dos, which become direct children of the " +
         "project (in the same order), NOT trashed. This is the opposite of deleting: nothing is " +
@@ -1230,7 +1278,7 @@ export function registerWriteCommands(program) {
         "Shortcuts heading-delete cascade, which TRASH the children. GUI-ONLY (drives the " +
         "heading row's ellipsis Delete): enable it once with `things config set ui.enabled true` " +
         "and pass --dangerously-drive-gui. Fails closed when the heading title is shared by " +
-        "another heading in the project. No undo — re-create the heading and move the to-dos back.")).action(async (projectRef, sel, opts) => {
+        "another heading in the project. No undo — re-create the heading and move the to-dos back."))).action(async (projectRef, sel, opts) => {
         await runWrite(opts, (c) => {
             const proj = c.resolve.project(projectRef);
             const h = c.resolve.heading(proj.uuid, sel);
@@ -1272,11 +1320,11 @@ export function registerWriteCommands(program) {
     }
     addDriveGuiFlag(addRepeatRuleFlags(addWriteFlags(project
         .command("make-repeating <ref>")
-        .description("Turn a project into a repeating one. This REPLACES the project with a new repeating " +
-        "series — the original disappears and a fresh recurring project takes its place (its " +
-        "area is kept; cannot be undone). An Anytime project with no area is moved to Someday " +
-        "first (a cleanup-free intermediate step, shown in --dry-run). Set the rule with the " +
-        "flags below; see `things help repeating`.")
+        .description("Turn a project into a repeating one. A disposable copy is promoted and the ORIGINAL is " +
+        "moved to the Trash — so `things undo` reverses it (it removes the new series and " +
+        "restores the original). Refuses a project that holds a nested repeating template. An " +
+        "Anytime project with no area is moved to Someday first (a cleanup-free intermediate " +
+        "step, shown in --dry-run). Set the rule with the flags below; see `things help repeating`.")
         .requiredOption("--frequency <freq>", REPEAT_FREQ_HELP)
         .requiredOption("--interval <n>", REPEAT_INTERVAL_HELP)))).action(async (uuid, opts) => {
         const frequency = opts["frequency"];
@@ -1288,30 +1336,73 @@ export function registerWriteCommands(program) {
             ...repeatRuleFlagsFromOpts(opts, frequency),
         }, writeOptionsFrom(opts)));
     });
-    addDriveGuiFlag(addWriteFlags(project
+    addDriveGuiFlag(addRepeatCalendarFlags(addWriteFlags(project
         .command("add-repeating <title>")
-        .description("Create a project and turn it into a repeating series in ONE call. Two operations: the " +
-        "project is created first and PERSISTS even if the make-repeating step refuses; then it " +
-        "is promoted (which drives the GUI). Give --area to place it, or omit it to create in " +
-        "Someday. The new repeating project's uuid is printed on success.")
+        .description("Create a project and turn it into a repeating series in ONE call. Two legs: the project " +
+        "is created (notes/area/when/deadline/child to-dos) and PERSISTS even if the promote " +
+        "refuses; then it is promoted (which drives the GUI). Give --area to place it, or omit " +
+        "it to create in Someday. The new repeating project's uuid is printed; `things undo` " +
+        "removes the created series (trash-both).")
         .option("--notes <text>", "notes body")
         .option("--area <ref>", "destination area (uuid or unique name)")
+        .option("--when <value>", "today | evening | anytime | someday | YYYY-MM-DD")
         .option("--deadline <date>", "YYYY-MM-DD")
         .option("--todo <title>", "initial child to-do (repeatable)", collect, [])
         .requiredOption("--frequency <freq>", REPEAT_FREQ_HELP)
-        .requiredOption("--interval <n>", REPEAT_INTERVAL_HELP))).action(async (title, opts) => {
+        .requiredOption("--interval <n>", REPEAT_INTERVAL_HELP)))).action(async (title, opts) => {
         const todos = opts["todo"];
         const area = containerRef(opts["area"]);
+        const frequency = opts["frequency"];
         if (opIdCompoundRefused(opts, "project add-repeating"))
             return;
         await runWrite(opts, (c) => c.write.addRepeatingProject({
             title,
             ...(opts["notes"] !== undefined && { notes: opts["notes"] }),
             ...(area !== undefined && { area }),
+            ...(opts["when"] !== undefined && { when: opts["when"] }),
             ...(opts["deadline"] !== undefined && { deadline: opts["deadline"] }),
             ...(todos.length > 0 && { todos }),
-            frequency: opts["frequency"],
-            interval: Number(opts["interval"]),
+            ...addRepeatingRuleFieldsFromOpts(opts, frequency, Number(opts["interval"])),
+        }, writeOptionsFrom(opts)));
+    });
+    addDriveGuiFlag(addRepeatCalendarFlags(addWriteFlags(todo
+        .command("add-repeating <title>")
+        .description("Create a to-do and turn it into a repeating series in ONE call. Two legs: the to-do is " +
+        "created (notes/tags/when/deadline/reminder/checklist/--created-at) and PERSISTS even " +
+        "if the promote refuses; then it is promoted (which drives the GUI). The new repeating " +
+        "template's uuid is printed; `things undo` removes the created series (trash-both).")
+        .option("--notes <text>", "notes body")
+        .option("--when <value>", "today | evening | anytime | someday | YYYY-MM-DD")
+        .option("--reminder <time>", "HH:mm reminder (needs a schedulable --when)")
+        .option("--deadline <date>", "YYYY-MM-DD")
+        .option("--tag <name>", "tag to attach (repeatable)", collect, [])
+        .option("--checklist-item <title>", "checklist item (repeatable)", collect, [])
+        .option("--project <ref>", "destination project (uuid or unique name)")
+        .option("--area <ref>", "destination area (uuid or unique name)")
+        .option("--heading <title>", "existing heading inside the target project")
+        .option("--created-at <iso>", "born with this creation timestamp (ISO date or datetime; a date is noon in the effective zone)")
+        .requiredOption("--frequency <freq>", REPEAT_FREQ_HELP)
+        .requiredOption("--interval <n>", REPEAT_INTERVAL_HELP)))).action(async (title, opts) => {
+        const tags = opts["tag"];
+        const checklistItems = opts["checklistItem"];
+        const projectRef = containerRef(opts["project"]);
+        const area = containerRef(opts["area"]);
+        const frequency = opts["frequency"];
+        if (opIdCompoundRefused(opts, "todo add-repeating"))
+            return;
+        await runWrite(opts, (c) => c.write.addRepeatingTodo({
+            title,
+            ...(opts["notes"] !== undefined && { notes: opts["notes"] }),
+            ...(opts["when"] !== undefined && { when: opts["when"] }),
+            ...(opts["reminder"] !== undefined && { reminder: opts["reminder"] }),
+            ...(opts["deadline"] !== undefined && { deadline: opts["deadline"] }),
+            ...(tags.length > 0 && { tags }),
+            ...(checklistItems.length > 0 && { checklistItems }),
+            ...(projectRef !== undefined && { project: projectRef }),
+            ...(area !== undefined && { area }),
+            ...(opts["heading"] !== undefined && { heading: opts["heading"] }),
+            ...(opts["createdAt"] !== undefined && { createdAt: opts["createdAt"] }),
+            ...addRepeatingRuleFieldsFromOpts(opts, frequency, Number(opts["interval"])),
         }, writeOptionsFrom(opts)));
     });
     addWriteFlags(project
@@ -1514,6 +1605,23 @@ export function registerWriteCommands(program) {
         "copy's uuid is printed on success. Not available for repeating projects.")).action(async (uuid, opts) => {
         await runWrite(opts, (c) => c.write.duplicateProject(uuid, writeOptionsFrom(opts)));
     });
+    addDriveGuiFlag(addWriteFlags(project
+        .command("clone <ref>")
+        .description("Clone a project (target by uuid or unique name) — a faithful content copy: area, " +
+        "headings, headed and root children (one import), notes and deadline, plus " +
+        "logged/canceled children and the project's own completed/canceled state with the " +
+        "exact original timestamps. The clone is a new capture (new uuid, created now); its " +
+        "uuid is printed on success. Refuses a trashed source and a project holding a nested " +
+        "repeating template (named in the refusal). A repeating-template project is cloned as " +
+        "a NEW repeating series (its content plus the source's rule, minted fresh — no " +
+        "instances copied); this drives the app (requires --dangerously-drive-gui) and refuses " +
+        "a rule the Repeat dialog cannot express. Undo trashes the clone and every child it " +
+        "minted (a template clone trashes the new series).")
+        .option("--title <text>", "give the clone a different title (default: the source's title)")
+        .option("--preserve-created", "copy the source's creation date onto the clone (minute resolution) instead of now"))).action(async (uuid, opts) => {
+        const clone = cloneArgs(opts);
+        await runWrite(opts, (c) => c.write.cloneProject(uuid, clone, writeOptionsFrom(opts)));
+    });
     addWriteFlags(project
         .command("complete <ref>")
         .description("Complete a project (target by uuid or unique name). Completing also completes its " +
@@ -1676,28 +1784,52 @@ export function registerWriteCommands(program) {
             }),
         })));
     });
+    addWriteFlags(program
+        .command("log-now")
+        .description("Move completed items to the Logbook now. Reports how many items were moved; when none " +
+        "are waiting it logs nothing (a clean no-op, not an error). This cannot be undone.")).action(async (opts) => {
+        await runWrite(opts, (c) => c.write.logNow(writeOptionsFrom(opts)), (result, o, m) => {
+            // Human path discloses the count inline; --json carries it on
+            // `observed.logged`. Everything else defers to the shared emitter.
+            if (result.kind === "ok" && o.json !== true) {
+                for (const warning of result.warnings ?? []) {
+                    process.stderr.write(`warning: ${warning}\n`);
+                }
+                const logged = result.observed?.logged ?? 0;
+                process.stdout.write(`ok log-now (logged ${logged} item${logged === 1 ? "" : "s"}, ` +
+                    `vector=${result.vector}, tier=${result.tier}, verified)\n`);
+                process.exitCode = ExitCode.Ok;
+                return;
+            }
+            emitResult(result, o, m);
+        });
+    });
     program
         .command("batch [file]")
         .description("Run MANY mutations from JSONL (file, or stdin when omitted/'-'): one op per line, " +
         '{"op": "<kind>", "params": {...}, "options": {...}} — see `things capabilities` for ' +
         "op kinds and params. Ops run sequentially and independently — NO transactions; a " +
-        "failure does not roll back earlier ops. Per-op results stream as JSONL. Per-op " +
+        "failure does not roll back earlier ops. A statically-invalid line (bad shape, unknown " +
+        "op, a $ref to an undeclared/forward tempId, a duplicate tempId) refuses the WHOLE " +
+        "batch before anything runs, naming every bad line. Otherwise ops run and per-op " +
+        "results stream as JSONL. Per-op " +
         "options carry the confirmation flags (acknowledgeChecklistReset, " +
         "acknowledgeProjectReopen, dangerouslyPermanent, acknowledgeTagSubtree). " +
         "CHAINING: an op that creates something may carry a `tempId` (a handle like " +
         '"proj1"); a LATER op references that new uuid as "$proj1" in any id/container ' +
         'param (dotted "$proj1.instance"/"$proj1.replaced" reach a repeating op\'s spawned ' +
         "instance / replaced source). A tempId is valid only on a creating op (not tag.add — " +
-        "reference a tag by title) and unique per batch; an unresolved/forward $ref fails just " +
-        "that line. IDEMPOTENCY: a line's `opId` makes resubmission safe — a matching earlier " +
-        "success is reported already-applied, not re-created. The trailing summary line adds " +
-        "`tempIdMapping` (handle → uuid) and `undoToken` — undo the WHOLE batch with " +
-        "`things undo --txn <undoToken>`. " +
-        "--dry-run plans everything without executing; --fail-fast skips the rest after " +
-        "the first failure. Exit (worst failure wins): 0 all ok · 3 any verify-failed/invalid " +
-        "· 4 any blocked · 5 any drift-blocked · 6 any unsupported.")
+        "reference a tag by title) and unique per batch. IDEMPOTENCY: a line's `opId` makes " +
+        "resubmission safe — a matching earlier success is reported already-applied, not " +
+        "re-created (put an opId on EVERY line so a stopped batch can be resubmitted verbatim " +
+        "to resume). The trailing summary line adds `tempIdMapping` (handle → uuid) and " +
+        "`undoToken` — undo the WHOLE batch with `things undo --txn <undoToken>`. " +
+        "By DEFAULT a runtime failure STOPS the batch (later lines reported not-run, with resume " +
+        "guidance in the summary); --continue-on-error runs past failures. --dry-run plans " +
+        "everything without executing. Exit (worst failure wins): 0 all ok · 3 any " +
+        "verify-failed/invalid · 4 any blocked · 5 any drift-blocked · 6 any unsupported.")
         .option("--dry-run", "plan every op; execute nothing")
-        .option("--fail-fast", "skip remaining ops after the first failure")
+        .option("--continue-on-error", "run past a failed op instead of stopping (default: stop)")
         .option("--json", "JSONL results + summary on stdout (also the default)")
         .option("--db <path>", "explicit database path")
         .option("--actor <name>", "author name recorded for the whole batch")
@@ -1738,7 +1870,7 @@ export function registerWriteCommands(program) {
             client = openThings(opts.db ? { dbPath: opts.db } : {});
             const batchResult = await client.write.batch(ops, {
                 ...(opts.dryRun !== undefined && { dryRun: opts.dryRun }),
-                ...(opts["failFast"] === true && { failFast: true }),
+                ...(opts["continueOnError"] === true && { continueOnError: true }),
                 ...(opts.actor !== undefined && { actor: opts.actor }),
             }, (r) => {
                 const pre = preInvalid.find((p) => p.index === r.index);
@@ -1757,6 +1889,10 @@ export function registerWriteCommands(program) {
                     // (undo the whole submission with `things undo --txn <token>`).
                     ...(hasMapping && { tempIdMapping: batchResult.tempIdMapping }),
                     ...(batchResult.undoToken !== undefined && { undoToken: batchResult.undoToken }),
+                    // ADDITIVE: resume guidance when a runtime failure stopped the batch
+                    // (Change 2) — how many lines did not run and whether a verbatim
+                    // resubmission is safe.
+                    ...(batchResult.resumption !== undefined && { resumption: batchResult.resumption }),
                 },
             };
             process.stdout.write(`${JSON.stringify(summary)}\n`);
@@ -1777,8 +1913,13 @@ export function registerWriteCommands(program) {
         "author's changes (e.g. `--by mcp` to clean up after an agent), or --txn <token> " +
         "to undo one exact change by the `undoToken` its result returned (immune to any " +
         "changes made in between). Changes made directly in the Things app cannot be " +
-        "undone here. IRREVERSIBLE changes are reported, not guessed: permanent deletes " +
-        "and changes whose prior state is unknown. Partial restores carry notes (e.g. a " +
+        "undone here. --last/--by select the N newest NOT-YET-undone changes: a change already " +
+        "undone is SKIPPED, so repeating `undo --last N` walks progressively deeper into " +
+        "history rather than re-selecting the same changes. An IRREVERSIBLE change is NOT " +
+        "skipped — it still counts toward N and is reported every pass (so you always see it " +
+        "rather than silently reaching past it). IRREVERSIBLE changes are reported, not " +
+        "guessed: permanent deletes and changes whose prior state is unknown. Partial " +
+        "restores carry notes (e.g. a " +
         "delete-undo lands in the Inbox de-scheduled). --dry-run shows every inverse plan " +
         "without executing. Undoing a CREATED area/tag deletes it permanently — requires " +
         "--dangerously-permanent. An undo is refused when the item changed outside things-api " +