@needmoretruth/nmts-cli 0.36.3 → 0.38.0

package/dist/commands/trash.d.ts

@@ -1,4 +1,3 @@
-import type { ManifestEntry } from "../shared/lib/drive/manifest-codec.ts";
 export interface TrashOptions {
     server?: string | undefined;
     network?: string | undefined;
@@ -7,11 +6,3 @@ export interface TrashOptions {
 }
 export declare function rm(paths: readonly string[], options?: TrashOptions): Promise<number>;
 export declare function restore(paths: readonly string[], options?: TrashOptions): Promise<number>;
-/**
- * Every file at or under one entry.
- *
- * ⚠ Trashed descendants are INCLUDED HERE, and the CALLER filters. Somebody who trashed one file
- *   last week and then trashes its folder expects the folder to be gone from the server too — so
- *   `rm` takes this set whole. `restore` cannot: see the note at the call site.
- */
-export declare function filesUnder(entries: readonly ManifestEntry[], rootId: string): ManifestEntry[];

package/dist/commands/trash.js

@@ -1,5 +1,10 @@
 // `nmts rm` and `nmts restore` — the two halves of the trash.
 //
+// ⛔ WHAT THEY DO IS IN `drive-edit.ts`; WHAT IS HERE IS THE TERMINAL. The server rows, the list
+//    write and every refusal about the list moved out the day the SDK needed the same two verbs
+//    without one — and the order of the two (row first, list second) is the rule a second copy
+//    would be most likely to get backwards.
+//
 // ⛔ NEITHER OF THESE DESTROYS ANYTHING. `rm` moves everything it is given to the trash, where it
 //    stays restorable for thirty days; the endpoint that erases a stored row for good is closed to
 //    an API key and stays closed, so no command here can reach it.
@@ -18,25 +23,9 @@
 //   said no verb without an undo would ever live in this tool; that stopped being true the day
 //   the sweep arrived, and a header that goes on describing the world before a change is the way
 //   the next reader is misled.
-//
-// ⛔ THE SERVER ROW GOES FIRST, AND "ALREADY DONE" COUNTS AS DONE. The order is not arbitrary and
-//    neither is the forgiveness:
-//      · A trashed item's bytes cannot be fetched — `GET /v1/items/{id}/parts` requires
-//        `deleted_at IS NULL`. So the state to avoid above all others is a drive that shows a file
-//        as live when the server has already trashed it: the person sees it, asks for it, and is
-//        told it does not exist.
-//      · Writing the list only after the server agreed means a failed server call leaves the
-//        drive exactly as it was, which is the state a person can act on.
-//      · And a 404 from the server means the row is already in the state being asked for, which
-//        is what an interrupted run leaves behind. Treating it as a failure would make the retry
-//        of a half-finished command impossible — the one moment the retry is needed.
-import { setTrashed } from "../item-trash.js";
-import { buildIndex, fullPathOf, isLive, KIND_FILE } from "../drive-paths.js";
+import { trashPaths } from "../drive-edit.js";
 import { NmtsError } from "../errors.js";
-import { readFileList } from "../manifest.js";
-import { applyManyToList, batchTargets } from "../manifest-write.js";
 import { openSession } from "../session.js";
-import { applyIntent } from "../shared/lib/drive/manifest-ops.js";
 export async function rm(paths, options = {}) {
     return run("rm", paths, options);
 }
@@ -52,150 +41,30 @@ async function run(verb, paths, options) {
         });
     }
     const session = await openSession(options);
-    const list = await readFileList(session.server, session.apiKey, session.code, session.accountId);
-    const entries = list.manifest?.entries ?? [];
-    // ⛔ `rm` REFUSES what is already in the trash rather than quietly doing nothing, so the caller
-    //    learns nothing was needed; `restore` has to be able to SEE the trash to act on it. That is
-    //    why the two lookups differ. (The comment that used to sit here claimed a shared lookup would
-    //    make `rm` say "no such path" — it would not: the refusal below names the trash either way.
-    //    A reason that does not hold teaches the next reader to keep the wrong branch.)
-    //
-    // ⛔ AND ONE PATH THAT WILL NOT RESOLVE REFUSES THE WHOLE RUN, before a single server row is
-    //    touched. Trashing four of the five things somebody named and exiting 0 is worse than
-    //    trashing none: the run reads as done, and finding the odd one out means diffing the drive.
-    const index = buildIndex(entries);
-    const found = batchTargets(entries, paths, {
-        ...(verb === "restore" ? { includeTrashed: true } : {}),
-        nothingHappened: "Nothing changed.",
-    });
-    const acting = [];
-    const skipped = [];
-    for (const entry of found) {
-        const at = fullPathOf(index, entry);
-        if (verb === "restore" && isLive(index, entry)) {
-            // Already in the state being asked for. Not a refusal — named, and left alone.
-            skipped.push(at);
-            continue;
-        }
-        if (verb === "restore" && entry.deletedAt === undefined) {
-            // In the trash, but only because something above it is. Restoring this row would clear a
-            // `deletedAt` it does not have and leave the person exactly where they were.
-            throw new NmtsError(`"${at}" is in the trash because a folder above it is.`, {
-                exitCode: 4,
-                nextStep: `Nothing changed. Restore that folder instead — \`nmts ls --all\` shows which one carries the trash.`,
-            });
-        }
-        acting.push({ entry, path: at });
-    }
-    // ⛔ NAMING A FOLDER AND SOMETHING INSIDE IT IS NAMING ONE TRASHING TWICE, and only for `rm` is
-    //    that a problem worth solving here: stamping the child as well would give it a thirty-day
-    //    clock of its own, and then restoring the folder would leave it behind — the person would
-    //    have to remember they had also named it to ever find it again. Its bytes are covered
-    //    either way, because the rows are read from the folder. `restore` is the opposite case: a
-    //    child with its own instant needs its own clearing, so nothing is dropped there.
-    const named = new Set(acting.map((t) => t.entry.id));
-    const covered = verb === "rm" ? acting.filter((t) => hasNamedAncestor(entries, t.entry, named)) : [];
-    const targets = acting.filter((t) => !covered.includes(t));
-    for (const t of covered)
-        skipped.push(t.path);
-    if (targets.length === 0) {
-        // Everything named was already where it was asked to be. A no-op is a success: writing the
-        // list would cost every other device a download for nothing.
-        return nothingToDo(say, options, verb, skipped, list.seq ?? 0);
-    }
-    // Every FILE at or under the targets — a folder holds no bytes and has no server row, so the
-    // rows to move are its file descendants.
-    //
-    // ⛔ THE ROWS TO MOVE ARE THE ONES THE EDIT WILL MAKE REACHABLE, so the set is read off a
-    //    PREVIEW of the list rather than guessed (2026-08-23). `rm` is easy — everything
-    //    under the target loses its bytes. `restore` is not: a file the person deleted separately
-    //    last week keeps its own `deletedAt`, stays in the trash after the folder comes back, and
-    //    its row must stay deleted with it. Restoring that row would cancel its own thirty-day
-    //    sweep, go on costing storage, and leave the list saying "trashed" while the server says
-    //    "live" — after which `rm` refuses to put it back and the tool has no way out.
-    const at = Date.now();
-    const ids = targets.map((t) => t.entry.id);
-    const preview = buildIndex(applyIntent(entries, intentFor(verb, ids, at)));
-    const under = uniqueById(targets.flatMap((t) => filesUnder(entries, t.entry.id)));
-    // ⚠ Judged on the PREVIEW's own row, not on the one in hand: `applyIntent` returns new objects,
-    //   so asking the preview about the old object reads the old `deletedAt` and answers "still
-    //   trashed" for the very thing being restored.
-    const files = verb === "rm"
-        ? under
-        : under.filter((f) => {
-            const after = preview.byId.get(f.id);
-            return after !== undefined && isLive(preview, after);
-        });
-    let done = 0;
-    try {
-        for (const file of files) {
-            await tellServer(session.server, session.apiKey, verb, file.id);
-            done += 1;
-        }
-    }
-    catch (error) {
-        // ⛔ A HALF-FINISHED RUN MUST NAME ITSELF. Without this the agent sees six words of stderr and
-        //    the tool's own guidance ("a refusal is not a transient error, do not retry in a loop")
-        //    steers it away from the one thing that fixes this — running the same command again.
-        const because = error instanceof Error ? error.message : "the server refused";
-        throw new NmtsError(because, {
-            exitCode: 1,
-            nextStep: `${done} of ${files.length} file rows were moved before this stopped, and the file list was ` +
-                `not written. Running \`nmts ${verb}\` on the same paths again finishes the job — nothing is lost.`,
-        });
-    }
-    // ⛔ THE IDS ARE DECIDED AGAIN ON EVERY ATTEMPT, and this is not ceremony. Between the read
-    //    above and the write below another device can put one of these targets in the trash — by
-    //    trashing it, or by moving it under a folder that already is. Re-applying the intent we
-    //    built earlier would then stamp `deletedAt` on something that is ALREADY in the trash by
-    //    inheritance, giving it a clock of its own and quietly detaching it from the folder it came
-    //    with: restoring that folder afterwards would leave it behind. An id that has left the list
-    //    entirely is dropped for the reason `manifest-ops.ts` gives — the other device removing it
-    //    is newer information than our edit, and putting it back would undo a deletion somebody
-    //    made on purpose.
-    const result = await applyManyToList(session, (now) => {
-        const nowIndex = buildIndex(now);
-        const still = ids.filter((id) => {
-            const live = nowIndex.byId.get(id);
-            if (live === undefined)
-                return false;
-            return verb === "rm" ? isLive(nowIndex, live) : live.deletedAt !== undefined;
-        });
-        return still.length === 0 ? [] : [intentFor(verb, still, at)];
-    });
-    const shown = targets.map((t) => t.path);
+    // ⛔ WITHOUT `strict`. A person gets a line saying what was already out of the trash and keeps
+    //    the rest of their run; a program gets a refusal, because it cannot read the line. The
+    //    difference is spelled once, where the option is declared.
+    const outcome = await trashPaths(session, verb, paths);
+    // ⚠ The outcome's own field order IS this output. Nothing is assembled here, so the two can
+    //   never drift into saying different things about the same run.
     if (options.json) {
-        say(JSON.stringify({
-            paths: shown,
-            ids,
-            files: files.length,
-            // Named, and nothing was written for them: already out of the trash, or already covered
-            // by a folder in the same run.
-            skipped,
-            changed: result.changed,
-            // ⚠ The one signal that another writer intervened. It was printed in prose and left out of
-            //   the JSON, which is the half an agent is told to read (2026-08-23).
-            reappliedAfterConflict: result.reappliedAfterConflict,
-            seq: result.seq,
-        }));
+        say(JSON.stringify(outcome));
         return 0;
     }
-    const moved = files.length === 1 ? "1 file" : `${files.length} files`;
-    const names = shown.map((s) => `"${s}"`).join(", ");
+    if (outcome.paths.length === 0)
+        return nothingToDo(say, verb, outcome.skipped);
+    const moved = outcome.files === 1 ? "1 file" : `${outcome.files} files`;
+    const names = outcome.paths.map((s) => `"${s}"`).join(", ");
     say(verb === "rm"
-        ? `Moved ${names} to the trash (${moved}). ${shown.length === 1 ? "It" : "They"} can be restored for 30 days.`
+        ? `Moved ${names} to the trash (${moved}). ${outcome.paths.length === 1 ? "It" : "They"} can be restored for 30 days.`
         : `Restored ${names} (${moved}).`);
-    if (skipped.length > 0)
-        say(`  ${skippedLine(verb, skipped)}`);
-    if (result.reappliedAfterConflict) {
+    if (outcome.skipped.length > 0)
+        say(`  ${skippedLine(verb, outcome.skipped)}`);
+    if (outcome.reappliedAfterConflict) {
         say(`  Another device wrote the file list first, so this was applied to that version.`);
     }
     return 0;
 }
-/** The one intent either verb writes. Built in two places, so it is spelled in one. */
-function intentFor(verb, ids, at) {
-    return verb === "rm" ? { op: "trash", ids, at } : { op: "restore", ids, at };
-}
 /** What was named but not acted on, in the words that say why. */
 function skippedLine(verb, skipped) {
     const names = skipped.map((s) => `"${s}"`).join(", ");
@@ -204,85 +73,16 @@ function skippedLine(verb, skipped) {
         : `${names} was not in the trash.`;
 }
 /**
- * The run had nothing to do. Says so in whichever form the caller asked for.
+ * The run had nothing to do.
  *
  * ⚠ In practice this is the `restore` case — everything named was already out of the trash.
  *   `rm` reaches it only if every path it resolved was inside another path it resolved, which
  *   cannot happen while the outermost one is always kept.
  */
-function nothingToDo(say, options, verb, skipped, seq) {
-    if (options.json) {
-        say(JSON.stringify({ paths: [], ids: [], files: 0, skipped, changed: false, reappliedAfterConflict: false, seq }));
-        return 0;
-    }
+function nothingToDo(say, verb, skipped) {
     const names = skipped.map((s) => `"${s}"`).join(", ");
     say(verb === "restore"
         ? `${names} ${skipped.length === 1 ? "is" : "are"} not in the trash. Nothing changed.`
         : `Nothing was left to move to the trash. Nothing changed.`);
     return 0;
 }
-/** Is any ancestor of this entry in the set? Used to drop a target a named folder already covers. */
-function hasNamedAncestor(entries, entry, named) {
-    const byId = buildIndex(entries).byId;
-    const seen = new Set([entry.id]);
-    let at = entry.parentId;
-    while (at !== null && !seen.has(at)) {
-        if (named.has(at))
-            return true;
-        seen.add(at);
-        at = byId.get(at)?.parentId ?? null;
-    }
-    return false;
-}
-/** One entry per id, keeping the first. Two named folders can hold the same file only once. */
-function uniqueById(files) {
-    const byId = new Map();
-    for (const file of files)
-        if (!byId.has(file.id))
-            byId.set(file.id, file);
-    return [...byId.values()];
-}
-/**
- * Every file at or under one entry.
- *
- * ⚠ Trashed descendants are INCLUDED HERE, and the CALLER filters. Somebody who trashed one file
- *   last week and then trashes its folder expects the folder to be gone from the server too — so
- *   `rm` takes this set whole. `restore` cannot: see the note at the call site.
- */
-export function filesUnder(entries, rootId) {
-    const root = entries.find((e) => e.id === rootId);
-    if (root === undefined)
-        return [];
-    if (root.kind === KIND_FILE)
-        return [root];
-    const childrenOf = new Map();
-    for (const e of entries) {
-        const list = childrenOf.get(e.parentId);
-        if (list === undefined)
-            childrenOf.set(e.parentId, [e]);
-        else
-            list.push(e);
-    }
-    const out = [];
-    const seen = new Set([rootId]);
-    const queue = [rootId];
-    while (queue.length > 0) {
-        const id = queue.pop();
-        if (id === undefined)
-            break;
-        for (const child of childrenOf.get(id) ?? []) {
-            if (seen.has(child.id))
-                continue;
-            seen.add(child.id);
-            if (child.kind === KIND_FILE)
-                out.push(child);
-            else
-                queue.push(child.id);
-        }
-    }
-    return out;
-}
-/** ⛔ 404 is "already in the state you asked for", which is what a half-finished run leaves. */
-async function tellServer(base, apiKey, verb, id) {
-    await setTrashed(base, apiKey, id, verb === "rm");
-}

package/dist/drive-edit.d.ts

@@ -0,0 +1,189 @@
+import { NmtsError } from "./errors.ts";
+import { type ListEditInput } from "./manifest-write.ts";
+import type { ManifestEntry } from "./shared/lib/drive/manifest-codec.ts";
+/**
+ * What went wrong, in a word a program can branch on.
+ *
+ * ⚠ FIVE, AND THEY ARE ABOUT THE LIST. A server refusal arrives as `ServerError` with the server's
+ *   own code, and a lost compare-and-swap that never settles arrives as a plain `NmtsError`;
+ *   neither is a decision this file made.
+ */
+export type DriveEditCode = 
+/** No entry at that path — or a path that names two, which is the same "which one?" */
+"NOT_FOUND"
+/** Something else in that folder already answers to that name. */
+ | "NAME_TAKEN"
+/** The name itself cannot be used: empty, `.`, `..`, or a path pretending to be a name. */
+ | "BAD_NAME"
+/** A restore was asked for something that is not in the trash, or not in it on its own account. */
+ | "NOT_IN_TRASH"
+/** A folder was asked to move inside itself. */
+ | "INTO_ITSELF";
+/** A refusal about the list, with the sentence a person reads and the word a program reads. */
+export declare class DriveEditError extends NmtsError {
+    readonly code: DriveEditCode;
+    constructor(code: DriveEditCode, message: string, options?: {
+        exitCode?: number;
+        nextStep?: string | null;
+    });
+}
+/**
+ * A new name is a name and not a path.
+ *
+ * ⛔ REFUSED RATHER THAN SPLIT. A name with a `/` in it is somebody asking for a move while typing
+ *    a rename, and quietly doing the move would put the file somewhere they did not look.
+ */
+export declare function requireNewName(name: string): string;
+/**
+ * Make a folder path, and every folder above it that is missing, for an account already opened.
+ *
+ * ⛔ THE RULES BELOW ARE THE ONES A SECOND COPY WOULD GET SUBTLY WRONG: a folder that is already
+ *    there IS the folder asked for (never a numbered one), the decision is taken inside each
+ *    attempt so a lost race cannot make two, and what was made before a failure is named rather
+ *    than silently kept.
+ *
+ * ⚠ MISSING PARENTS ARE CREATED, and that is a decision rather than a convenience. A folder costs
+ *   nothing, holds nothing and can be moved to the trash, so the failure mode of creating one too
+ *   many is a tidy-up; the failure mode of refusing is a caller that has to discover the tree one
+ *   call at a time. Every folder made is named in the result, so it is never a surprise.
+ */
+export declare function ensureFolderPath(input: ListEditInput, wanted: string): Promise<{
+    parentId: string | null;
+    made: string[];
+}>;
+/** What making a folder did. `made` is empty when every folder in the path was already there. */
+export interface MadeFolder {
+    /** The path as the drive spells it — no leading slash, no trailing one. */
+    path: string;
+    /** The folder at the end of the path. Null only for the top of the drive, which is never made. */
+    parentId: string | null;
+    /** The folders this call actually made, outermost first. */
+    made: string[];
+}
+/** Make one folder path. A path that is already there is a success with nothing made. */
+export declare function makeFolder(input: ListEditInput, path: string): Promise<MadeFolder>;
+/** One thing a move carried, with where it came from and where it landed. */
+export interface MovedThing {
+    id: string;
+    /** Its name, which a move never changes. */
+    name: string;
+    /** Its full path before the move. */
+    from: string;
+    /** Its full path after, or null if another device took it out of the list meanwhile. */
+    path: string | null;
+}
+/** What one run of moving did. */
+export interface MoveOutcome {
+    /** The things this run moved, in the order they were named. */
+    moved: MovedThing[];
+    /** The names that were already in the destination, so nothing was written for them. */
+    already: string[];
+    /** The destination folder id, or null for the top of the drive. */
+    parentId: string | null;
+    /** False when everything named was already there, so no list was written. */
+    changed: boolean;
+    /** True when the list was rebuilt because another device wrote first. */
+    reappliedAfterConflict: boolean;
+    /** The list version now current. */
+    seq: number;
+}
+/**
+ * Move things into a folder. An empty destination is the top of the drive.
+ *
+ * ⛔ ONE WRITE FOR THE WHOLE RUN, however many things are named. The list is rewritten whole on
+ *    every save, so a second thing costs nothing extra — while a second WRITE is a second chance
+ *    to lose the compare-and-swap, and losing it half way through a run leaves some things moved
+ *    and some not, which is a state the caller cannot tell apart from the one it asked for.
+ *
+ * ⛔ AND THE NAME CHECK RUNS AGAINST WHAT THIS RUN HAS ALREADY MOVED, not against the list as it
+ *    was read. Two files called `notes.txt` in two folders, moved into one folder by one call,
+ *    would otherwise both be written — two entries at one path, which nothing can address
+ *    afterwards: every lookup answers "names 2 things in this account". So the loop folds each
+ *    move onto a working copy and asks the working copy the next question.
+ */
+export declare function moveEntries(input: ListEditInput, paths: readonly string[], destination: string): Promise<MoveOutcome>;
+/** What renaming one thing did. */
+export interface RenameOutcome {
+    id: string;
+    /** The name it had. */
+    from: string;
+    /** The full path it had, which is what a person recognises it by. */
+    fromPath: string;
+    /** The name it has now. */
+    to: string;
+    /** False when it was already called that, so no list was written. */
+    changed: boolean;
+    reappliedAfterConflict: boolean;
+    seq: number;
+}
+/**
+ * Give one thing a new name. The path stays the same otherwise.
+ *
+ * ⛔ REFUSED RATHER THAN NUMBERED, AND THE REFUSAL IS RE-DECIDED ON EVERY ATTEMPT. An upload picks
+ *    `report (2).pdf` because nobody was watching; a rename is somebody choosing a name on purpose,
+ *    and silently giving them a different one is how two files end up looking like a mistake nobody
+ *    made. Checking once, before the write, was not enough: when another device took the name in
+ *    between, the retry re-applied the old decision and produced two entries at one path, which
+ *    nothing can address afterwards (2026-08-23).
+ */
+export declare function renameEntry(input: ListEditInput, path: string, name: string): Promise<RenameOutcome>;
+/**
+ * What one run of the trash did — and, in this order, exactly what `nmts rm --json` prints.
+ *
+ * ⛔ THE ORDER OF THESE FIELDS IS THE COMMAND'S JSON. The command hands this object straight to
+ *    `JSON.stringify`, so a field added in the middle changes what an agent reading that output
+ *    sees. Add at the end, or not at all.
+ */
+export interface TrashOutcome {
+    /** The paths acted on. Empty when everything named was already where it was asked to be. */
+    paths: string[];
+    /** Their ids, in the same order. */
+    ids: string[];
+    /** How many server rows were moved. A folder has none of its own; its files have one each. */
+    files: number;
+    /** Named, and nothing written for them: already out of the trash, or covered by a named folder. */
+    skipped: string[];
+    changed: boolean;
+    reappliedAfterConflict: boolean;
+    seq: number;
+}
+export interface TrashEditOptions {
+    /**
+     * Refuse what the command-line tool names and carries on with.
+     *
+     * ⛔ OFF FOR THE COMMANDS AND ON FOR A LIBRARY, and the difference is who is reading. A person
+     *    who typed `nmts restore a.txt b.txt` and had already restored `a.txt` wants `b.txt` back and
+     *    a line saying the first was not in the trash; a program calling `restore` wants to know that
+     *    what it asked for was not what it got, and the only way it learns that is a refusal.
+     *
+     * It adds two: a path that is not in the trash (`NOT_IN_TRASH`) and a restore whose old name has
+     * been taken since (`NAME_TAKEN`).
+     */
+    strict?: boolean;
+}
+/**
+ * Move things to the trash, or bring them back.
+ *
+ * ⛔ NEITHER HALF DESTROYS ANYTHING. `rm` moves everything it is given to the trash, where it stays
+ *    restorable for thirty days; the endpoint that erases a stored row for good is closed to an API
+ *    key and stays closed, so nothing here can reach it.
+ *
+ * ⛔ THE SERVER ROW GOES FIRST, AND "ALREADY DONE" COUNTS AS DONE. A trashed item's bytes cannot be
+ *    fetched, so the state to avoid above all others is a list that shows a file as live when the
+ *    server has already trashed it: the person sees it, asks for it, and is told it does not exist.
+ *    Writing the list only after the server agreed means a failed server call leaves the drive
+ *    exactly as it was — the state a caller can act on.
+ *
+ * ⛔ AND ONE PATH THAT WILL NOT RESOLVE REFUSES THE WHOLE RUN, before a single server row is
+ *    touched. Trashing four of the five things somebody named and answering success is worse than
+ *    trashing none: the run reads as done, and finding the odd one out means diffing the drive.
+ */
+export declare function trashPaths(input: ListEditInput, verb: "rm" | "restore", paths: readonly string[], options?: TrashEditOptions): Promise<TrashOutcome>;
+/**
+ * Every file at or under one entry.
+ *
+ * ⚠ Trashed descendants are INCLUDED HERE, and the CALLER filters. Somebody who trashed one file
+ *   last week and then trashes its folder expects the folder to be gone from the server too — so
+ *   `rm` takes this set whole. `restore` cannot: see the note at the call site.
+ */
+export declare function filesUnder(entries: readonly ManifestEntry[], rootId: string): ManifestEntry[];