driggsby 0.9.0 → 0.9.2

package/dist/import/import-command.js

@@ -3,7 +3,7 @@
 // answer its rare question, and undo it; and driggsby accounts list. Built for agents with
 // no Driggsby context: the file (or the ID Driggsby gives it) is the only
 // handle, repeating any command is safe, `--wait` never outlasts a coding
-// agent's command limit, and every output ends with the exact next command
+// agent's command limit, and every output ends with the exact next step
 // (import-render.ts holds that contract).
 import { apiBaseUrl } from "../api/base-url.js";
 import { CliError } from "../cli-error.js";
@@ -117,7 +117,8 @@ async function runStart(session, options, io) {
     }
     return renderStatus(view, {
         compact: options.wait && startedIn === "categorizing",
-        repeated: target.kind === "file" && !created && given === null,
+        // Found already this far: a wait that watched it land shows it in full.
+        repeated: target.kind === "file" && !created && given === null && view.state === startedIn,
         unchanged: outcome.note !== null,
         rerun: { file: typedFile, account: options.account, create: options.create },
     }, context(io));

package/dist/import/import-render.js

@@ -1,8 +1,9 @@
 // What the import command prints. Every output follows one contract, so an
 // agent with no Driggsby context never has to guess: the first line says
 // where things stand ("Started:", "Waiting for an answer:", "Done:", ...)
-// and is never wrapped, and the last lines give the exact command to run
-// next, complete, with one command per answer when the person must choose.
+// and is never wrapped, and the last lines give the exact next step: a
+// complete command wherever one exists, one per answer when the person must
+// choose, and otherwise what to do (email support at the limit).
 // Names Driggsby sends (a file, an account) print quoted and capped, so they
 // read as names and never as the CLI's own sentence.
 import { formatBytes } from "@driggsby/deploy";
@@ -60,7 +61,9 @@ function statusBody(view, options, context) {
         case "waiting":
             return ok(renderQuestion(view));
         case "categorizing":
-            return ok(options.compact ? categorizingLine(view) : landed(view, "Imported"));
+            if (options.compact)
+                return ok(categorizingLine(view));
+            return ok(options.repeated ? alreadyImported(view) : landed(view, "Imported"));
         case "done":
             return ok(done(view, options, context));
         case "stopped":
@@ -78,11 +81,15 @@ function undoingLine(view) {
         : `Undoing: removing the transactions ${name(view.file)} added.`;
 }
 // Importing the file again, aimed where the first try was; a stop about the
-// account starts from the account list instead.
+// account starts from the account list instead, and one at the limit from
+// support, since running anything again would stop the same way.
 function rerun(view, options) {
     if (ACCOUNT_STOPS.has(view.stopped?.code ?? "")) {
         return `Next, to see your accounts and their IDs:\n  ${CLI} accounts list\n`;
     }
+    if (view.stopped?.code === "limit_reached") {
+        return next("Email support@driggsby.com to keep importing.");
+    }
     const flags = accountFlags(options.rerun.account, options.rerun.create);
     if (options.rerun.file !== null && flags !== "") {
         return next(`${CLI} import ${options.rerun.file}${flags}`);
@@ -136,10 +143,15 @@ export function renderQuestion(view) {
 export function choiceLines(choices, command) {
     return `${choices.map((choice) => `  ${name(choice.label)}\n    ${command(choice)}`).join("\n")}\n`;
 }
+// One transaction "is", any other count "are".
+function be(count) {
+    return count === 1 ? "is" : "are";
+}
 // The transactions are in: what landed, then what's left to do.
 function landed(view, headline) {
-    const where = view.account === null ? " landed" : ` are in ${name(view.account)}`;
-    const top = `${headline}: ${plural(view.counts?.new ?? 0, "transaction")} from ${name(view.file)}${where}.`;
+    const count = view.counts?.new ?? 0;
+    const where = view.account === null ? " landed" : ` ${be(count)} in ${name(view.account)}`;
+    const top = `${headline}: ${plural(count, "transaction")} from ${name(view.file)}${where}.`;
     const undoCommand = `  ${CLI} import undo ${view.ref}\n`;
     // A new account is the person's to name by its ID from here on.
     const again = view.newAccount && view.accountRef !== null ? `Next time, for this account:\n  ${CLI} import <FILE> --account ${view.accountRef}\n\n` : "";
@@ -182,6 +194,14 @@ function progressText(view) {
     const left = progress.secondsLeft === null ? "" : `, ${timeLeft(progress.secondsLeft)}`;
     return `${progress.categorized.toLocaleString("en-US")} of ${progress.total.toLocaleString("en-US")} so far${left}`;
 }
+// The same file sent again while categories fill in: it's already in, and
+// this run imported nothing, so it never reads as a second import.
+function alreadyImported(view) {
+    const count = view.counts?.new ?? 0;
+    const into = view.account === null ? " landed" : ` ${be(count)} in ${name(view.account)}`;
+    return (`Already imported: this file's ${plural(count, "transaction")}${into} (${view.ref}). Categories: ${progressText(view)}.\n\n` +
+        `${wrapProse("Nothing else to do unless you need the categories. To wait for them:")}\n  ${waitCommand(view.ref)}\n`);
+}
 function categorizingLine(view) {
     const progress = view.progress;
     const where = progress === null || progress.categorized === 0
@@ -194,14 +214,15 @@ function done(view, options, context) {
         const why = NOTHING_NEW[view.nothingNew] ?? "none of its transactions were new";
         return `Done: nothing new in ${name(view.file)}: ${why}.\n\nNothing else to do.\n`;
     }
+    const count = view.counts?.new ?? 0;
     // A wait that followed categorizing ends on how it went, even for a file
     // sent again.
     if (options.compact && view.categorized === false) {
-        return (`Done: ${plural(view.counts?.new ?? 0, "transaction")} from ${name(view.file)} are in, but some couldn't be categorized.\n\n` +
+        return (`Done: ${plural(count, "transaction")} from ${name(view.file)} ${be(count)} in, but some couldn't be categorized.\n\n` +
             `${wrapProse("Those show as uncategorized. Nothing else to do: the import is finished.")}\n`);
     }
     if (options.compact) {
-        return `Done: all ${plural(view.counts?.new ?? 0, "transaction")} from ${name(view.file)} are categorized.\n\nNothing else to do: the import is finished.\n`;
+        return `Done: ${count === 1 ? "the" : "all"} ${plural(count, "transaction")} from ${name(view.file)} ${be(count)} categorized.\n\nNothing else to do: the import is finished.\n`;
     }
     if (options.repeated) {
         const on = view.finishedAt === null ? "" : ` on ${shortDate(view.finishedAt, context)}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "driggsby",
-  "version": "0.9.0",
+  "version": "0.9.2",
   "description": "Set up and build on Driggsby, the MCP server for personal finance.",
   "license": "Apache-2.0 AND OFL-1.1",
   "repository": {
@@ -30,7 +30,7 @@
     "node": ">=18"
   },
   "dependencies": {
-    "@driggsby/deploy": "0.9.0",
-    "@driggsby/sdk": "0.9.0"
+    "@driggsby/deploy": "0.9.2",
+    "@driggsby/sdk": "0.9.2"
   }
 }