@isaacthoman/pulpo 0.45.0 → 0.47.0

package/README.md

@@ -39,3 +39,7 @@ Management token scopes are `account:read`, `account:write`, `instance:read`,
 Administrator scopes continue to require the token owner's current administrator
 role. Tokens are shown only once when created and only work below
 `/api/management/v1`.
+
+Deleting a model permanently reassigns its historical chats and usage to the
+hidden `unknown model` placeholder while retaining recorded token and cost
+totals. Active or queued model work must finish before deletion can proceed.

package/dist/index.js

@@ -14857,31 +14857,44 @@ var webToolProviderSchema = external_exports.enum(["kagi", "firecrawl"]);
 var webToolProviderOrderSchema = external_exports.array(webToolProviderSchema).length(2).refine((value) => new Set(value).size === 2, "Provider order must contain Kagi and Firecrawl exactly once");
 var kagiWebProviderSettingsSchema = external_exports.object({
   searchEnabled: external_exports.boolean().default(true),
-  extractEnabled: external_exports.boolean().default(true)
+  billSearches: external_exports.boolean().default(false),
+  searchPriceMicros: external_exports.number().int().min(0).max(1e9).default(12e3),
+  extractEnabled: external_exports.boolean().default(true),
+  billExtracts: external_exports.boolean().default(false),
+  extractPriceMicros: external_exports.number().int().min(0).max(1e9).default(4e3)
 });
 var firecrawlWebProviderSettingsSchema = external_exports.object({
   searchEnabled: external_exports.boolean().default(false),
+  billSearches: external_exports.boolean().default(false),
+  searchPriceMicros: external_exports.number().int().min(0).max(1e9).default(12e3),
   extractEnabled: external_exports.boolean().default(false),
+  billExtracts: external_exports.boolean().default(false),
+  extractPriceMicros: external_exports.number().int().min(0).max(1e9).default(4e3),
   baseUrl: external_exports.url().default("https://api.firecrawl.dev/v2"),
-  maxAgeSeconds: external_exports.number().int().min(0).max(31536e3).default(0),
-  costPerCreditMicros: external_exports.number().int().min(0).max(1e9).default(0)
+  maxAgeSeconds: external_exports.number().int().min(0).max(31536e3).default(0)
 });
 var webToolsSettingsSchema = external_exports.object({
   searchEnabled: external_exports.boolean().default(false),
   extractEnabled: external_exports.boolean().default(false),
-  billSearches: external_exports.boolean().default(false),
-  billExtracts: external_exports.boolean().default(false),
-  searchPriceMicros: external_exports.number().int().min(0).max(1e9).default(12e3),
-  extractPriceMicros: external_exports.number().int().min(0).max(1e9).default(4e3),
   searchProviderOrder: webToolProviderOrderSchema.default(["kagi", "firecrawl"]),
   extractProviderOrder: webToolProviderOrderSchema.default(["kagi", "firecrawl"]),
-  kagi: kagiWebProviderSettingsSchema.default({ searchEnabled: true, extractEnabled: true }),
+  kagi: kagiWebProviderSettingsSchema.default({
+    searchEnabled: true,
+    billSearches: false,
+    searchPriceMicros: 12e3,
+    extractEnabled: true,
+    billExtracts: false,
+    extractPriceMicros: 4e3
+  }),
   firecrawl: firecrawlWebProviderSettingsSchema.default({
     searchEnabled: false,
+    billSearches: false,
+    searchPriceMicros: 12e3,
     extractEnabled: false,
+    billExtracts: false,
+    extractPriceMicros: 4e3,
     baseUrl: "https://api.firecrawl.dev/v2",
-    maxAgeSeconds: 0,
-    costPerCreditMicros: 0
+    maxAgeSeconds: 0
   })
 });
 var managementScopeSchema = external_exports.enum([
@@ -15321,6 +15334,30 @@ import { dirname, join } from "node:path";
 import { promisify } from "node:util";
 var execFileAsync = promisify(execFile);
 var KEYCHAIN_SERVICE = "Pulpo CLI";
+var MACOS_KEYCHAIN_WRITE_SCRIPT = String.raw`
+log_user 0
+set timeout 15
+set secret [gets stdin]
+set context $env(PULPO_CLI_KEYCHAIN_CONTEXT)
+spawn /usr/bin/security add-generic-password -U -s "Pulpo CLI" -a $context -w
+expect {
+  -re {password data for .*item:} { send -- "$secret\r" }
+  timeout { exit 124 }
+  eof { set result [wait]; exit [lindex $result 3] }
+}
+expect {
+  -re {retype password for .*item:} { send -- "$secret\r"; exp_continue }
+  timeout { exit 124 }
+  eof { set result [wait]; exit [lindex $result 3] }
+}
+`;
+function macosKeychainWriteCommand(context) {
+  return {
+    command: "/usr/bin/expect",
+    args: ["-c", MACOS_KEYCHAIN_WRITE_SCRIPT],
+    env: { ...process.env, PULPO_CLI_KEYCHAIN_CONTEXT: context }
+  };
+}
 function configRoot() {
   if (process.platform === "win32") return join(process.env.APPDATA ?? join(homedir(), "AppData", "Roaming"), "pulpo");
   return join(process.env.XDG_CONFIG_HOME ?? join(homedir(), ".config"), "pulpo");
@@ -15396,11 +15433,17 @@ async function keychainGet(context) {
 async function keychainSet(context, token) {
   try {
     if (process.platform === "darwin") {
+      if (!await commandExists("expect") || token.includes("\n")) return false;
+      const invocation = macosKeychainWriteCommand(context);
       await new Promise((resolve, reject) => {
-        const child = spawn("security", ["add-generic-password", "-U", "-s", KEYCHAIN_SERVICE, "-a", context, "-w"], { stdio: ["pipe", "ignore", "ignore"] });
+        const child = spawn(invocation.command, invocation.args, {
+          env: invocation.env,
+          stdio: ["pipe", "ignore", "ignore"]
+        });
         child.once("error", reject);
-        child.once("exit", (code) => code === 0 ? resolve() : reject(new Error(`security exited ${code}`)));
-        child.stdin.end(token);
+        child.once("exit", (code) => code === 0 ? resolve() : reject(new Error(`expect exited ${code}`)));
+        child.stdin.end(`${token}
+`);
       });
       return true;
     }
@@ -15547,7 +15590,7 @@ async function confirmExact(io, expected, yes, json2) {
 }
 
 // src/index.ts
-var CLI_VERSION = true ? "0.45.0" : "0.1.0";
+var CLI_VERSION = true ? "0.47.0" : "0.1.0";
 var CLI_BUNDLED = true;
 var commandIo = /* @__PURE__ */ new WeakMap();
 var commandClientFactory = /* @__PURE__ */ new WeakMap();
@@ -15703,7 +15746,10 @@ function registerFileCrud(program, io, input) {
     emit(io, command, await client.request(`${input.pluralPath}/${encodeURIComponent(id)}`, { method: "PATCH", body }));
   });
   if (input.remove !== false) group.command("delete <id>").action(async (id, _options, command) => {
-    await confirmExact(io, id, Boolean(globalOptions(command).yes), Boolean(globalOptions(command).json));
+    const options = globalOptions(command);
+    if (input.deleteWarning && !options.yes && !options.json) io.stderr.write(`${input.deleteWarning}
+`);
+    await confirmExact(io, id, Boolean(options.yes), Boolean(options.json));
     const { client } = await clientFor(command);
     await client.request(`${input.pluralPath}/${encodeURIComponent(id)}`, { method: "DELETE" });
     emit(io, command, { id, deleted: true });
@@ -15912,7 +15958,11 @@ function createProgram(io = processIo, dependencies = {}) {
     const { client } = await clientFor(command);
     emit(io, command, await client.request(`/api/management/v1/labs/${encodeURIComponent(id)}/models/order`, { method: "PUT", body: await jsonFile(options.file) }));
   });
-  registerFileCrud(program, io, { name: "model", pluralPath: "/api/management/v1/models" });
+  registerFileCrud(program, io, {
+    name: "model",
+    pluralPath: "/api/management/v1/models",
+    deleteWarning: "Historical references will be permanently reassigned to \u201Cunknown model\u201D."
+  });
   const user = registerFileCrud(program, io, { name: "user", pluralPath: "/api/management/v1/users" });
   for (const [action, patch] of [["approve", { role: "user" }], ["block", { blocked: true }], ["unblock", { blocked: false }]]) {
     user.command(`${action} <id>`).action(async (id, _options, command) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@isaacthoman/pulpo",
-  "version": "0.45.0",
+  "version": "0.47.0",
   "description": "Operator-first command-line client for Pulpo",
   "type": "module",
   "bin": {