@larkup/cli 0.2.5 → 0.2.6

package/dist/{chunk-TH2MPRMA.js → chunk-VY6I42DP.js}

@@ -146,9 +146,21 @@ async function execInstall(packageName, version, target, onProgress) {
         onProgress?.(`Running: npm install ${specifier}`);
         const { stderr } = await execAsync(installCmd, {
           cwd: toolsDir,
-          timeout: 12e4,
-          // 2 minute timeout
-          env: { ...process.env, NODE_ENV: "production" }
+          // Native tool dependencies can take longer under Docker Desktop's
+          // amd64 emulation. Let the request finish instead of reporting a
+          // misleading connection error part way through installation.
+          timeout: target === "docker" ? 3e5 : 12e4,
+          env: {
+            ...process.env,
+            NODE_ENV: "production",
+            // The Docker image runs as an unprivileged user. Keep npm's cache
+            // beside the isolated install so a named .larkup volume is always
+            // writable and installing a Marketplace tool does not fail before
+            // it reaches the registry.
+            HOME: process.env.HOME && process.env.HOME !== "/nonexistent" ? process.env.HOME : toolsDir,
+            npm_config_cache: path.join(toolsDir, ".npm-cache"),
+            npm_config_update_notifier: "false"
+          }
         });
         if (stderr && !stderr.includes("npm warn")) {
           console.warn(`[marketplace] Install stderr: ${stderr}`);
@@ -319,7 +331,7 @@ async function uninstallTool(toolId) {
     }
   }
   invalidateRegistryCache();
-  const { unloadTool: unloadTool2 } = await import("./tool-loader-B2J2R64F.js");
+  const { unloadTool: unloadTool2 } = await import("./tool-loader-QU6HBUCA.js");
   unloadTool2(toolId);
 }
 async function notifyHubInstall(toolId) {

package/dist/index.js

@@ -19,7 +19,7 @@ import {
   isToolInstalled,
   loadTool,
   uninstallTool
-} from "./chunk-TH2MPRMA.js";
+} from "./chunk-VY6I42DP.js";
 import {
   getAllTools,
   getToolById
@@ -34,7 +34,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@larkup/cli",
-  version: "0.2.5",
+  version: "0.2.6",
   publishConfig: {
     access: "public"
   },
@@ -3413,6 +3413,18 @@ async function writeState(state) {
   if (file) await fs2.writeFile(file, JSON.stringify(state, null, 2), "utf8");
   return state;
 }
+async function withActiveVectorTable(config) {
+  const server = await getActiveServer();
+  if (!server || config.vectorStore && config.vectorStore !== "lancedb") return config;
+  const safeId = server.id.replace(/[^a-zA-Z0-9_-]/g, "_");
+  return {
+    ...config,
+    storeConfig: {
+      ...config.storeConfig,
+      tableName: `documents_${safeId}`
+    }
+  };
+}
 function pidAlive(pid) {
   if (!pid) return false;
   try {
@@ -3423,7 +3435,7 @@ function pidAlive(pid) {
   }
 }
 async function emitToDisk(config) {
-  const server = generateServer(config);
+  const server = generateServer(await withActiveVectorTable(config));
   const dir = await outDir(true);
   if (!dir) throw new Error("No active server to emit to.");
   await fs2.mkdir(dir, { recursive: true });
@@ -3459,7 +3471,8 @@ async function startServer(config, serverApiKey) {
     }
   }
   await killPort(port);
-  const dir = await emitToDisk(config);
+  const runtimeConfig = await withActiveVectorTable(config);
+  const dir = await emitToDisk(runtimeConfig);
   try {
     await execAsync("npm install --omit=dev", {
       cwd: dir,
@@ -3474,7 +3487,7 @@ async function startServer(config, serverApiKey) {
     const message = err instanceof Error ? err.message : "npm install failed";
     return writeState({ ...emptyState(port), lastError: message });
   }
-  const dbPath = config.storeConfig.dbPath || "./.larkup/lancedb";
+  const dbPath = runtimeConfig.storeConfig.dbPath || "./.larkup/lancedb";
   const absDb = path2.isAbsolute(dbPath) ? dbPath : path2.join(process.cwd(), dbPath);
   const logPath = path2.join(dir, "server.log");
   await fs2.writeFile(logPath, "", "utf8");
@@ -3487,35 +3500,35 @@ async function startServer(config, serverApiKey) {
     env: {
       ...process.env,
       PORT: String(port),
-      TOP_K: String(config.topK),
+      TOP_K: String(runtimeConfig.topK),
       SERVER_API_KEY: serverApiKey || "",
-      EMBEDDING_API_KEY: config.embeddingApiKey || process.env.EMBEDDING_API_KEY || process.env.OPENAI_API_KEY || "",
-      CHAT_API_KEY: config.chatApiKey || config.customChatModels?.find(
-        (model) => model.modelName === config.chatModelId?.replace(/^custom:/, "")
+      EMBEDDING_API_KEY: runtimeConfig.embeddingApiKey || process.env.EMBEDDING_API_KEY || process.env.OPENAI_API_KEY || "",
+      CHAT_API_KEY: runtimeConfig.chatApiKey || runtimeConfig.customChatModels?.find(
+        (model) => model.modelName === runtimeConfig.chatModelId?.replace(/^custom:/, "")
       )?.apiKey || process.env.CHAT_API_KEY || process.env.OPENAI_API_KEY || "",
-      CHAT_MODEL: process.env.CHAT_MODEL || resolveChatModel(config),
-      CHAT_BASE_URL: config.customChatModels?.find(
-        (model) => model.modelName === config.chatModelId?.replace(/^custom:/, "")
+      CHAT_MODEL: process.env.CHAT_MODEL || resolveChatModel(runtimeConfig),
+      CHAT_BASE_URL: runtimeConfig.customChatModels?.find(
+        (model) => model.modelName === runtimeConfig.chatModelId?.replace(/^custom:/, "")
       )?.baseUrl || process.env.CHAT_BASE_URL || "",
-      OPENAI_API_KEY: config.embeddingApiKey || config.chatApiKey || process.env.OPENAI_API_KEY || "",
-      ANTHROPIC_API_KEY: config.chatApiKey || config.embeddingApiKey || process.env.ANTHROPIC_API_KEY || "",
-      COHERE_API_KEY: config.embeddingApiKey || config.chatApiKey || process.env.COHERE_API_KEY || "",
-      GOOGLE_GENERATIVE_AI_API_KEY: config.embeddingApiKey || config.chatApiKey || process.env.GOOGLE_GENERATIVE_AI_API_KEY || "",
-      PINECONE_API_KEY: config.storeConfig.apiKey || "",
-      PINECONE_INDEX: config.storeConfig.indexName || "",
-      PINECONE_NAMESPACE: config.storeConfig.namespace || "",
-      PINECONE_SPARSE_MODEL: config.storeConfig.sparseModel || "",
-      PINECONE_SPARSE_INDEX: config.storeConfig.sparseIndexName || "",
-      LANCEDB_MODE: config.storeConfig.mode || "local",
+      OPENAI_API_KEY: runtimeConfig.embeddingApiKey || runtimeConfig.chatApiKey || process.env.OPENAI_API_KEY || "",
+      ANTHROPIC_API_KEY: runtimeConfig.chatApiKey || runtimeConfig.embeddingApiKey || process.env.ANTHROPIC_API_KEY || "",
+      COHERE_API_KEY: runtimeConfig.embeddingApiKey || runtimeConfig.chatApiKey || process.env.COHERE_API_KEY || "",
+      GOOGLE_GENERATIVE_AI_API_KEY: runtimeConfig.embeddingApiKey || runtimeConfig.chatApiKey || process.env.GOOGLE_GENERATIVE_AI_API_KEY || "",
+      PINECONE_API_KEY: runtimeConfig.storeConfig.apiKey || "",
+      PINECONE_INDEX: runtimeConfig.storeConfig.indexName || "",
+      PINECONE_NAMESPACE: runtimeConfig.storeConfig.namespace || "",
+      PINECONE_SPARSE_MODEL: runtimeConfig.storeConfig.sparseModel || "",
+      PINECONE_SPARSE_INDEX: runtimeConfig.storeConfig.sparseIndexName || "",
+      LANCEDB_MODE: runtimeConfig.storeConfig.mode || "local",
       LANCEDB_PATH: absDb,
-      LANCEDB_URI: config.storeConfig.uri || "",
-      LANCEDB_API_KEY: config.storeConfig.apiKey || "",
-      LANCEDB_S3_URI: config.storeConfig.s3Uri || "",
-      AWS_ENDPOINT: config.storeConfig.s3Endpoint || "",
-      AWS_REGION: config.storeConfig.s3Region || "",
-      AWS_ACCESS_KEY_ID: config.storeConfig.s3AccessKeyId || "",
-      AWS_SECRET_ACCESS_KEY: config.storeConfig.s3SecretAccessKey || "",
-      LANCEDB_TABLE: config.storeConfig.tableName || "documents"
+      LANCEDB_URI: runtimeConfig.storeConfig.uri || "",
+      LANCEDB_API_KEY: runtimeConfig.storeConfig.apiKey || "",
+      LANCEDB_S3_URI: runtimeConfig.storeConfig.s3Uri || "",
+      AWS_ENDPOINT: runtimeConfig.storeConfig.s3Endpoint || "",
+      AWS_REGION: runtimeConfig.storeConfig.s3Region || "",
+      AWS_ACCESS_KEY_ID: runtimeConfig.storeConfig.s3AccessKeyId || "",
+      AWS_SECRET_ACCESS_KEY: runtimeConfig.storeConfig.s3SecretAccessKey || "",
+      LANCEDB_TABLE: runtimeConfig.storeConfig.tableName || "documents"
     }
   });
   child.unref();

package/dist/{tool-loader-B2J2R64F.js → tool-loader-QU6HBUCA.js}

@@ -3,7 +3,7 @@ import {
   isToolLoaded,
   loadTool,
   unloadTool
-} from "./chunk-TH2MPRMA.js";
+} from "./chunk-VY6I42DP.js";
 import "./chunk-P5JVXA7X.js";
 import "./chunk-3RG5ZIWI.js";
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@larkup/cli",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "publishConfig": {
     "access": "public"
   },
@@ -28,9 +28,9 @@
     "cli-table3": "^0.6.5",
     "commander": "^15.0.0",
     "zod": "^4.4.3",
-    "@larkup/core": "0.2.2",
+    "@larkup/marketplace": "0.1.6",
     "@larkup/vector-stores": "0.1.22",
-    "@larkup/marketplace": "0.1.5"
+    "@larkup/core": "0.2.3"
   },
   "devDependencies": {
     "tsup": "^8.0.0",