@isaacthoman/pulpo 0.44.0 → 0.46.0

package/dist/index.js

@@ -14853,14 +14853,50 @@ var agentSettingsSchema = external_exports.object({
   commandTimeoutSeconds: external_exports.number().int().min(1).max(3600).default(600),
   maxToolOutputBytes: external_exports.number().int().min(1024).max(1e7).default(1e5)
 });
-var webToolsSettingsSchema = external_exports.object({
-  searchEnabled: external_exports.boolean().default(false),
-  extractEnabled: external_exports.boolean().default(false),
+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),
   billSearches: external_exports.boolean().default(false),
-  billExtracts: 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)
+});
+var webToolsSettingsSchema = external_exports.object({
+  searchEnabled: external_exports.boolean().default(false),
+  extractEnabled: external_exports.boolean().default(false),
+  searchProviderOrder: webToolProviderOrderSchema.default(["kagi", "firecrawl"]),
+  extractProviderOrder: webToolProviderOrderSchema.default(["kagi", "firecrawl"]),
+  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
+  })
+});
 var managementScopeSchema = external_exports.enum([
   "account:read",
   "account:write",
@@ -15298,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");
@@ -15373,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;
     }
@@ -15524,7 +15590,7 @@ async function confirmExact(io, expected, yes, json2) {
 }
 
 // src/index.ts
-var CLI_VERSION = true ? "0.44.0" : "0.1.0";
+var CLI_VERSION = true ? "0.46.0" : "0.1.0";
 var CLI_BUNDLED = true;
 var commandIo = /* @__PURE__ */ new WeakMap();
 var commandClientFactory = /* @__PURE__ */ new WeakMap();
@@ -15695,8 +15761,10 @@ function createProgram(io = processIo, dependencies = {}) {
   commandIo.set(program, io);
   commandClientFactory.set(program, dependencies.createClient);
   const contexts = program.command("context").description("Manage Pulpo instance contexts");
-  contexts.command("add <name>").requiredOption("--url <url>").action(async (name, options, command) => {
-    const config2 = await addContext(name, options.url);
+  contexts.command("add <name>").action(async (name, _options, command) => {
+    const url2 = globalOptions(command).url;
+    if (!url2) throw new Error("Context URL is required; pass --url <url>");
+    const config2 = await addContext(name, url2);
     emit(io, command, { name, ...config2.contexts[name], current: config2.currentContext === name });
   });
   contexts.command("list").action(async (_options, command) => {

package/package.json

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