@dench.com/cli 0.3.0 → 0.3.1

package/fs-daemon.ts

@@ -27,9 +27,11 @@
  *
  * Usage (daemon mode):
  *   dench-fs-daemon \
- *     --org-id <orgId> \
  *     --workspace /workspace \
  *     --hot-cache /tmp/dench-cache
+ *
+ * `--org-id` is optional: when omitted, the daemon resolves the organization
+ * from DENCH_API_KEY via Convex before it starts watching files.
  */
 import { createHash } from "node:crypto";
 import { mkdirSync } from "node:fs";
@@ -39,7 +41,7 @@ import { ConvexClient, ConvexHttpClient } from "convex/browser";
 import { makeFunctionReference } from "convex/server";
 
 type Args = {
-  orgId: string;
+  orgId?: string;
   workspace: string;
   hotCache: string;
 };
@@ -71,11 +73,6 @@ function parseArgs(argv: string[]): Args {
   out.workspace ??= process.env.DENCH_VOLUME_PATH?.trim() || "/workspace";
   out.hotCache ??=
     process.env.DENCH_HOT_CACHE_PATH?.trim() || "/tmp/dench-cache";
-  if (!out.orgId) {
-    throw new Error(
-      "dench-fs-daemon: org id is required. Set DENCH_ORG_ID env var or pass --org-id.",
-    );
-  }
   return out as Args;
 }
 
@@ -185,6 +182,9 @@ const api = {
     ),
     deleteFile: makeFunctionReference<"mutation">("functions/files:deleteFile"),
     listTree: makeFunctionReference<"query">("functions/files:listTree"),
+    resolveApiKeyOrganization: makeFunctionReference<"query">(
+      "functions/files:resolveApiKeyOrganization",
+    ),
     appendLiveBuffer: makeFunctionReference<"mutation">(
       "functions/files:appendLiveBuffer",
     ),
@@ -201,17 +201,24 @@ class DenchFileClient {
   private http: ConvexHttpClient;
   private realtime: ConvexClient | null = null;
 
-  constructor(convexUrl: string, apiKey: string) {
+  constructor(
+    convexUrl: string,
+    private readonly apiKey: string,
+  ) {
     this.http = new ConvexHttpClient(convexUrl);
-    // Convex's HTTP client supports a Bearer token for auth via setAuth.
-    // The unified Dench API key is accepted by the validator we wired in
-    // convex/lib/denchApiKey.ts.
-    this.http.setAuth(apiKey);
+  }
+
+  async resolveOrganizationId(): Promise<string> {
+    const result = (await this.http.query(api.files.resolveApiKeyOrganization, {
+      apiKey: this.apiKey,
+    })) as { organizationId: string };
+    return result.organizationId;
   }
 
   async generateUploadUrl(path: string): Promise<string> {
     return (await this.http.mutation(api.files.generateUploadUrl, {
       path,
+      apiKey: this.apiKey,
     })) as string;
   }
 
@@ -242,7 +249,10 @@ class DenchFileClient {
     lastModifiedBy: string;
   }): Promise<{ versionConflict: boolean; currentHash?: string }> {
     try {
-      await this.http.mutation(api.files.commitFileUpload, args);
+      await this.http.mutation(api.files.commitFileUpload, {
+        ...args,
+        apiKey: this.apiKey,
+      });
       return { versionConflict: false };
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
@@ -260,12 +270,16 @@ class DenchFileClient {
   }
 
   async deleteFile(path: string): Promise<void> {
-    await this.http.mutation(api.files.deleteFile, { path });
+    await this.http.mutation(api.files.deleteFile, {
+      path,
+      apiKey: this.apiKey,
+    });
   }
 
   async getSignedDownloadUrl(path: string): Promise<string | null> {
     const url = (await this.http.action(api.files.getFileSignedDownloadUrl, {
       path,
+      apiKey: this.apiKey,
     })) as string | null;
     return url ?? null;
   }
@@ -275,11 +289,17 @@ class DenchFileClient {
     runId: string;
     chunk: string;
   }): Promise<void> {
-    await this.http.mutation(api.files.appendLiveBuffer, args as never);
+    await this.http.mutation(api.files.appendLiveBuffer, {
+      ...args,
+      apiKey: this.apiKey,
+    } as never);
   }
 
   async finalizeLiveBuffer(path: string): Promise<void> {
-    await this.http.mutation(api.files.finalizeLiveBuffer, { path });
+    await this.http.mutation(api.files.finalizeLiveBuffer, {
+      path,
+      apiKey: this.apiKey,
+    });
   }
 
   /**
@@ -298,7 +318,7 @@ class DenchFileClient {
     }
     const unsubscribe = this.realtime.onUpdate(
       api.files.listTree,
-      { prefix: "/" },
+      { prefix: "/", apiKey: this.apiKey },
       (rows: unknown) => {
         const list = Array.isArray(rows)
           ? (rows as Array<{
@@ -350,14 +370,16 @@ async function runDaemon(daemonArgs: Args): Promise<void> {
     return;
   }
 
+  const client = new DenchFileClient(convexUrl, apiKey);
+  const resolvedOrgId =
+    daemonArgs.orgId ?? (await client.resolveOrganizationId());
   console.log(
-    `[dench-fs-daemon] starting org=${daemonArgs.orgId} workspace=${daemonArgs.workspace}`,
+    `[dench-fs-daemon] starting org=${resolvedOrgId} workspace=${daemonArgs.workspace}`,
   );
   mkdirSync(daemonArgs.workspace, { recursive: true });
   mkdirSync(daemonArgs.hotCache, { recursive: true });
 
   const tracker = new HashTracker();
-  const client = new DenchFileClient(convexUrl, apiKey);
 
   let chokidar: typeof import("chokidar");
   try {
@@ -606,11 +628,19 @@ async function main(): Promise<void> {
  */
 async function runInitialSync(argv: string[]): Promise<void> {
   const initial = argv.includes("--initial");
-  const orgId = argv[argv.indexOf("--org-id") + 1];
-  const workspace = argv[argv.indexOf("--workspace") + 1] ?? "/workspace";
-  if (!initial || !orgId) {
+  const orgIdIndex = argv.indexOf("--org-id");
+  const workspaceIndex = argv.indexOf("--workspace");
+  const orgId =
+    orgIdIndex === -1
+      ? (process.env.DENCH_ORG_ID?.trim() ?? undefined)
+      : argv[orgIdIndex + 1];
+  const workspace =
+    workspaceIndex === -1
+      ? "/workspace"
+      : (argv[workspaceIndex + 1] ?? "/workspace");
+  if (!initial) {
     throw new Error(
-      "dench fs sync --initial --org-id <orgId> [--workspace /workspace]",
+      "dench fs sync --initial [--org-id <orgId>] [--workspace /workspace]",
     );
   }
   const convexUrl = process.env.CONVEX_URL?.trim();
@@ -619,6 +649,10 @@ async function runInitialSync(argv: string[]): Promise<void> {
     throw new Error("dench fs sync requires CONVEX_URL + DENCH_API_KEY in env");
   }
   const client = new DenchFileClient(convexUrl, apiKey);
+  const resolvedOrgId = orgId ?? (await client.resolveOrganizationId());
+  process.stdout.write(
+    `[dench-fs-daemon] initial sync org=${resolvedOrgId} workspace=${workspace}\n`,
+  );
   const fs = await import("node:fs/promises");
   const path = await import("node:path");
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dench.com/cli",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "Dench agent workspace CLI.",
   "type": "module",
   "bin": {