driggsby 0.2.4 → 0.3.0

package/dist/query/query-command.js

@@ -0,0 +1,78 @@
+// driggsby query: run one read-only tool once with the saved sign-in and
+// print its result as JSON — exactly what driggsby.watch hands an app's
+// callback for the same tool and params — so an agent can read a result's
+// shape before writing render code. stdout carries only the JSON; every
+// message is a CliError on stderr, so the output can be piped or saved.
+import { apiBaseUrl } from "../api/base-url.js";
+import { CliError } from "../cli-error.js";
+import { defaultCredentialEnvironment, } from "../credentials/store.js";
+import { McpBroker } from "../dev/mcp-broker.js";
+import { SQL_TOOLS } from "../args-query.js";
+import { APP_TOOL_ALLOWLIST } from "../dev/tool-allowlist.js";
+import { deployFailure, requireDeploySession, SIGN_IN_AGAIN_MESSAGE } from "../deploy/api-session.js";
+import { quotedForTerminal, wrapProse } from "../terminal-text.js";
+// The Driggsby endpoint requires a short reason on most read tools; when
+// the caller gives none, this names the CLI rather than the dev preview.
+const QUERY_REASON = "Checking this tool's result shape from the driggsby CLI.";
+function defaultQueryIo() {
+    return {
+        out: (text) => {
+            process.stdout.write(text);
+        },
+    };
+}
+export async function runQuery(options, environment = defaultCredentialEnvironment(), io = defaultQueryIo()) {
+    // The parser already rejects a tool apps cannot call; re-checking here keeps
+    // the read-only guarantee (and the echoed retry command) from hanging on
+    // one distant caller.
+    if (!APP_TOOL_ALLOWLIST.has(options.tool)) {
+        throw new CliError(`${quotedForTerminal(options.tool, 60)} isn't a tool a Driggsby app can call.`, 2);
+    }
+    const baseUrl = apiBaseUrl(environment.env);
+    const retryCommand = retryCommandFor(options);
+    try {
+        const session = await requireDeploySession(environment);
+        const broker = new McpBroker({
+            baseUrl: session.baseUrl,
+            token: session.token,
+            defaultReason: QUERY_REASON,
+            signInAgainMessage: SIGN_IN_AGAIN_MESSAGE,
+            // A connection failure here should read as one (a blocked network
+            // names the host to allow), not as a tool that "couldn't run".
+            transportErrors: "throw",
+        });
+        const outcome = await broker.runToolCall(options.tool, options.params);
+        if (!outcome.ok) {
+            // The tool's own message (a SQL error, a refused param) is the
+            // answer the caller needs. The broker sanitized and capped it to one
+            // line; wrapping bounds its width. The sign-in-again message is ours
+            // and keeps its own line breaks.
+            const message = outcome.error.message === SIGN_IN_AGAIN_MESSAGE
+                ? outcome.error.message
+                : wrapProse(outcome.error.message);
+            throw new CliError(message, 1);
+        }
+        io.out(`${JSON.stringify(outcome.result, null, 2)}\n`);
+        return 0;
+    }
+    catch (error) {
+        throw deployFailure(error, baseUrl, retryCommand);
+    }
+}
+// The command to run again after a network blip. User values are never
+// rebuilt into a shell line: no quoting is right for sh, cmd.exe, and
+// PowerShell at once, so the flags to repeat are named in a plain
+// sentence under the command instead.
+function retryCommandFor(options) {
+    const command = `npx driggsby@latest query ${options.tool}`;
+    // Only the SQL tools take --sql; for every other tool a sql key is just
+    // another param, and naming --sql would describe a command the parser
+    // refuses.
+    const sqlAsFlag = SQL_TOOLS.has(options.tool) && options.params.sql !== undefined;
+    const otherKeys = Object.keys(options.params).filter((key) => !(sqlAsFlag && key === "sql"));
+    const flags = [sqlAsFlag ? "--sql" : null, otherKeys.length > 0 ? "--params" : null].filter((flag) => flag !== null);
+    if (flags.length === 0) {
+        return command;
+    }
+    return `${command}\n  with the same ${flags.join(" and ")} as before`;
+}

package/dist/terminal-text.js

@@ -17,3 +17,18 @@ const TRAILING_RUST_WHITESPACE = new RegExp(`${RUST_WHITESPACE_CLASS}+$`);
 export function trimLikeRust(value) {
     return value.replace(LEADING_RUST_WHITESPACE, "").replace(TRAILING_RUST_WHITESPACE, "");
 }
+// Comma-separated names on indented lines that stay inside 80 columns.
+export function wrapNames(names, indent) {
+    const lines = [];
+    let line = indent;
+    for (const [index, name] of names.entries()) {
+        const piece = index === names.length - 1 ? `${name}.` : `${name},`;
+        if (line !== indent && line.length + 1 + piece.length > 80) {
+            lines.push(line);
+            line = indent;
+        }
+        line += line === indent ? piece : ` ${piece}`;
+    }
+    lines.push(line);
+    return lines.join("\n");
+}

package/package.json

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