agor-live 0.22.0 → 0.23.2

package/dist/daemon/utils/spawn-executor.js

@@ -127,6 +127,13 @@ function generateTaskId() {
   return Array.from(bytes).map((b) => b.toString(16).padStart(2, "0")).join("");
 }
 function findExecutorPath() {
+  const configuredPath = process.env.AGOR_EXECUTOR_PATH;
+  if (configuredPath) {
+    if (!existsSync(configuredPath)) {
+      throw new Error(`Configured AGOR_EXECUTOR_PATH does not exist: ${configuredPath}`);
+    }
+    return configuredPath;
+  }
   const dirname = typeof __dirname !== "undefined" ? __dirname : path.dirname(fileURLToPath(import.meta.url));
   const possiblePaths = [
     path.join(dirname, "../executor/cli.js"),
@@ -237,6 +244,12 @@ function spawnExecutorLocal(payload, options) {
     options.onExit?.(127);
     return;
   }
+  let reportedExit = false;
+  const reportExit = (code) => {
+    if (reportedExit) return;
+    reportedExit = true;
+    options.onExit?.(code);
+  };
   const executorProcess = spawn(cmd, args, {
     cwd,
     env: asUser ? void 0 : { ...envWithDaemonUrl },
@@ -250,6 +263,7 @@ function spawnExecutorLocal(payload, options) {
   onSpawn?.(executorProcess);
   executorProcess.on("error", (error) => {
     console.error(`${logPrefix} Spawn error:`, error.message);
+    reportExit(127);
   });
   executorProcess.on("exit", (code) => {
     if (code === 0) {
@@ -257,7 +271,7 @@ function spawnExecutorLocal(payload, options) {
     } else {
       console.error(`${logPrefix} Executor exited with code ${code}`);
     }
-    options.onExit?.(code);
+    reportExit(code);
   });
   executorProcess.stdin?.write(JSON.stringify(payload));
   executorProcess.stdin?.end();
@@ -270,6 +284,12 @@ function spawnExecutorWithTemplate(payload, options) {
   console.log(`${logPrefix} Task ID: ${templateVariables.task_id}`);
   console.log(`${logPrefix} Command: ${payload.command}`);
   console.log(`${logPrefix} Template command (first 200 chars): ${command.slice(0, 200)}...`);
+  let reportedExit = false;
+  const reportExit = (code) => {
+    if (reportedExit) return;
+    reportedExit = true;
+    options.onExit?.(code);
+  };
   const executorProcess = spawn("sh", ["-c", command], {
     env: { ...process.env, LOG_LEVEL: logLevel },
     stdio: ["pipe", "pipe", "pipe"]
@@ -283,6 +303,7 @@ function spawnExecutorWithTemplate(payload, options) {
   });
   executorProcess.on("error", (error) => {
     console.error(`${logPrefix} Spawn error:`, error.message);
+    reportExit(127);
   });
   executorProcess.on("exit", (code) => {
     if (code === 0) {
@@ -294,7 +315,7 @@ function spawnExecutorWithTemplate(payload, options) {
         `${logPrefix} Executor exited with code ${code} (task: ${templateVariables.task_id})`
       );
     }
-    options.onExit?.(code);
+    reportExit(code);
   });
   executorProcess.stdin?.write(JSON.stringify(payload));
   executorProcess.stdin?.end();
@@ -574,12 +595,19 @@ function createServiceToken(jwtSecret, expiresIn, scope = {}) {
     expiresIn || "5m"
   );
 }
-function generateSessionToken(app) {
+function serviceTokenScopeForParams(params) {
+  const tenantId = params?.tenant?.tenant_id ?? params?.tenant_id ?? params?.user?.tenant_id;
+  return tenantId ? { tenant_id: tenantId } : {};
+}
+function generateSessionToken(app, scope = {}) {
   const jwtSecret = app.settings.authentication?.secret;
   if (!jwtSecret) {
     throw new Error("JWT secret not configured in app settings");
   }
-  return createServiceToken(jwtSecret);
+  return createServiceToken(jwtSecret, void 0, scope);
+}
+function generateScopedServiceToken(app, params) {
+  return generateSessionToken(app, serviceTokenScopeForParams(params));
 }
 function createConfiguredSpawner(executionConfig) {
   return function configuredSpawnExecutor(payload, options = {}) {
@@ -600,10 +628,12 @@ export {
   createConfiguredSpawner,
   createServiceToken,
   findExecutorPath,
+  generateScopedServiceToken,
   generateSessionToken,
   generateTaskId,
   getDaemonUrl,
   runExecutorCommand,
+  serviceTokenScopeForParams,
   spawnExecutor,
   spawnExecutorFireAndForget,
   substituteTemplateVariables

package/dist/daemon/utils/tenant-db-scope.d.ts

@@ -0,0 +1,20 @@
+import { type AgorConfig } from '@agor/core/config';
+import { type TenantScopeAwareDatabase } from '@agor/core/db';
+import type { HookContext } from '@agor/core/types';
+interface TenantDatabaseScopeOptions {
+    db: TenantScopeAwareDatabase;
+    config: AgorConfig;
+    jwtSecret: string;
+}
+export declare function resolveTenantIdForDeferredScope(params?: unknown): string | undefined;
+/**
+ * Schedule asynchronous work outside the current ALS store, then re-enter a
+ * fresh tenant database scope for the captured tenant. Use this for delayed
+ * executor/queue/gateway work: bare setImmediate inherits possibly-committed
+ * transaction objects, but a bare runWithoutTenantDatabaseScope loses Postgres
+ * RLS context entirely.
+ */
+export declare function deferWithTenantDatabaseScope(db: TenantScopeAwareDatabase, params: unknown, work: () => Promise<void>, onError?: (error: unknown) => void): void;
+export declare function createTenantDatabaseScopeAroundHook(options: TenantDatabaseScopeOptions): (context: HookContext, next: () => Promise<void>) => Promise<void>;
+export {};
+//# sourceMappingURL=tenant-db-scope.d.ts.map

package/dist/daemon/utils/tenant-db-scope.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tenant-db-scope.d.ts","sourceRoot":"","sources":["../../src/utils/tenant-db-scope.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,UAAU,EAIhB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAKL,KAAK,wBAAwB,EAC9B,MAAM,eAAe,CAAC;AAEvB,OAAO,KAAK,EAAE,WAAW,EAA2B,MAAM,kBAAkB,CAAC;AAI7E,UAAU,0BAA0B;IAClC,EAAE,EAAE,wBAAwB,CAAC;IAC7B,MAAM,EAAE,UAAU,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;CACnB;AAkBD,wBAAgB,+BAA+B,CAAC,MAAM,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAGpF;AAED;;;;;;GAMG;AACH,wBAAgB,4BAA4B,CAC1C,EAAE,EAAE,wBAAwB,EAC5B,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,EACzB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,GACjC,IAAI,CAmCN;AAED,wBAAgB,mCAAmC,CAAC,OAAO,EAAE,0BAA0B,IAkDvE,SAAS,WAAW,EAAE,MAAM,MAAM,OAAO,CAAC,IAAI,CAAC,KAAG,OAAO,CAAC,IAAI,CAAC,CAY9E"}

package/dist/daemon/utils/tenant-db-scope.js

@@ -0,0 +1,114 @@
+// src/utils/tenant-db-scope.ts
+import {
+  resolveMultiTenancyConfig,
+  resolveTenantContext,
+  TenantResolutionError
+} from "@agor/core/config";
+import {
+  enqueueTenantDatabasePostCommitCallback,
+  getCurrentTenantId,
+  runWithoutTenantDatabaseScope,
+  runWithTenantDatabaseScope
+} from "@agor/core/db";
+import { NotAuthenticated } from "@agor/core/feathers";
+import jwt2 from "jsonwebtoken";
+
+// src/auth/runtime-tokens.ts
+import jwt from "jsonwebtoken";
+var RUNTIME_JWT_ISSUER = "agor";
+var RUNTIME_JWT_AUDIENCE = "https://agor.dev";
+
+// src/utils/tenant-db-scope.ts
+function readHeaderValue(headers, name) {
+  if (!headers) return null;
+  const wanted = name.toLowerCase();
+  for (const [key, value] of Object.entries(headers)) {
+    if (key.toLowerCase() !== wanted) continue;
+    const raw = Array.isArray(value) ? value[0] : value;
+    return typeof raw === "string" && raw.trim() ? raw.trim() : null;
+  }
+  return null;
+}
+function resolveTenantIdForDeferredScope(params) {
+  const scopedParams = params;
+  return scopedParams?.tenant?.tenant_id ?? getCurrentTenantId();
+}
+function deferWithTenantDatabaseScope(db, params, work, onError) {
+  const tenantId = resolveTenantIdForDeferredScope(params);
+  if (!tenantId) {
+    const error = new Error("Missing tenant context for deferred tenant-scoped work");
+    if (onError) {
+      onError(error);
+    } else {
+      console.error("[tenant-db-scope] Deferred tenant-scoped work skipped:", error);
+    }
+    return;
+  }
+  const schedule = () => {
+    runWithoutTenantDatabaseScope(() => {
+      setImmediate(() => {
+        void runWithTenantDatabaseScope(db, tenantId, work).catch((error) => {
+          if (onError) {
+            onError(error);
+            return;
+          }
+          console.error("[tenant-db-scope] Deferred tenant-scoped work failed:", error);
+        });
+      });
+    });
+  };
+  if (enqueueTenantDatabasePostCommitCallback(async () => schedule())) {
+    return;
+  }
+  schedule();
+}
+function createTenantDatabaseScopeAroundHook(options) {
+  const multiTenancy = resolveMultiTenancyConfig(options.config);
+  const bearerPayloadFromHeaders = (headers) => {
+    const authorization = readHeaderValue(headers, "authorization");
+    const match = authorization?.match(/^Bearer\s+(.+)$/i);
+    if (!match || !options.jwtSecret) return void 0;
+    try {
+      return jwt2.verify(match[1], options.jwtSecret, {
+        issuer: RUNTIME_JWT_ISSUER,
+        audience: RUNTIME_JWT_AUDIENCE
+      });
+    } catch {
+      return void 0;
+    }
+  };
+  const resolveTenantForDatabaseScope = (context) => {
+    const params = context.params;
+    const connectionTenant = params.connection?.tenant ?? params.connection?.data?.tenant;
+    const paramsWithConnectionTenant = connectionTenant && typeof connectionTenant === "object" && "tenant_id" in connectionTenant ? { ...params, tenant: params.tenant ?? connectionTenant } : params;
+    try {
+      return resolveTenantContext(multiTenancy, {
+        params: paramsWithConnectionTenant,
+        authPayload: paramsWithConnectionTenant.authentication?.payload ?? bearerPayloadFromHeaders(paramsWithConnectionTenant.headers),
+        headers: paramsWithConnectionTenant.headers
+      });
+    } catch (error) {
+      const inheritedTenantId = getCurrentTenantId();
+      if (error instanceof TenantResolutionError && inheritedTenantId) {
+        return { tenant_id: inheritedTenantId, source: "explicit" };
+      }
+      throw error;
+    }
+  };
+  return async (context, next) => {
+    try {
+      context.params.tenant = resolveTenantForDatabaseScope(context);
+    } catch (error) {
+      if (error instanceof TenantResolutionError) {
+        throw new NotAuthenticated(error.message);
+      }
+      throw error;
+    }
+    await runWithTenantDatabaseScope(options.db, context.params.tenant?.tenant_id, next);
+  };
+}
+export {
+  createTenantDatabaseScopeAroundHook,
+  deferWithTenantDatabaseScope,
+  resolveTenantIdForDeferredScope
+};

package/dist/daemon/utils/unix-group-init.d.ts

@@ -10,8 +10,8 @@
  *   client.service('repos').initializeUnixGroup(...)
  *   client.service('branches').initializeUnixGroup(...)
  */
-import type { Database } from '@agor/core/db';
+import type { TenantScopeAwareDatabase } from '@agor/core/db';
 import type { Application } from '@agor/core/feathers';
-export declare function initializeRepoUnixGroup(db: Database, app: Application, repoId: string, userId?: string): Promise<string>;
-export declare function initializeBranchUnixGroup(db: Database, app: Application, branchId: string, othersAccess: 'none' | 'read' | 'write'): Promise<string>;
+export declare function initializeRepoUnixGroup(db: TenantScopeAwareDatabase, app: Application, repoId: string, userId?: string): Promise<string>;
+export declare function initializeBranchUnixGroup(db: TenantScopeAwareDatabase, app: Application, branchId: string, othersAccess: 'none' | 'read' | 'write'): Promise<string>;
 //# sourceMappingURL=unix-group-init.d.ts.map

package/dist/daemon/utils/unix-group-init.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"unix-group-init.d.ts","sourceRoot":"","sources":["../../src/utils/unix-group-init.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAKH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAE9C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAoCvD,wBAAsB,uBAAuB,CAC3C,EAAE,EAAE,QAAQ,EACZ,GAAG,EAAE,WAAW,EAChB,MAAM,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,MAAM,CAAC,CAsEjB;AAID,wBAAsB,yBAAyB,CAC7C,EAAE,EAAE,QAAQ,EACZ,GAAG,EAAE,WAAW,EAChB,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GACtC,OAAO,CAAC,MAAM,CAAC,CAmGjB"}
+{"version":3,"file":"unix-group-init.d.ts","sourceRoot":"","sources":["../../src/utils/unix-group-init.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAKH,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAC;AAE9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAoCvD,wBAAsB,uBAAuB,CAC3C,EAAE,EAAE,wBAAwB,EAC5B,GAAG,EAAE,WAAW,EAChB,MAAM,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,MAAM,CAAC,CAsEjB;AAID,wBAAsB,yBAAyB,CAC7C,EAAE,EAAE,wBAAwB,EAC5B,GAAG,EAAE,WAAW,EAChB,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GACtC,OAAO,CAAC,MAAM,CAAC,CAmGjB"}

package/dist/daemon/utils/upload.d.ts

@@ -1,12 +1,8 @@
 /**
  * Upload middleware using multer for file upload handling
  *
- * Supports uploading files to:
- * - Branch (.agor/uploads/) - Default, agent-accessible
- * - Temp folder - Ephemeral uploads
- * - Global (~/.agor/uploads/) - Shared across sessions
+ * Stores daemon-side uploads under ~/.agor/uploads/.
  */
-import type { BranchRepository, SessionRepository } from '@agor/core/db';
 import type { NextFunction, Request, Response } from 'express';
 import multer from 'multer';
 /**
@@ -26,17 +22,18 @@ export declare const MAX_UPLOAD_FILES_PER_REQUEST = 10;
 /** Max combined size of all files in a single request (bytes). */
 export declare const MAX_UPLOAD_TOTAL_SIZE: number;
 /**
- * Destination types for file uploads
+ * Resolve the only supported daemon-side upload directory.
  */
-export type UploadDestination = 'branch' | 'temp' | 'global';
+export declare function getUploadDirectory(): string;
+export declare function validateUploadDestinationQuery(destination: unknown): void;
 /**
  * Create multer storage configuration
  */
-export declare function createUploadStorage(sessionRepo: SessionRepository, branchRepo: BranchRepository): multer.StorageEngine;
+export declare function createUploadStorage(): multer.StorageEngine;
 /**
  * Create configured multer instance
  */
-export declare function createUploadMiddleware(sessionRepo: SessionRepository, branchRepo: BranchRepository): multer.Multer;
+export declare function createUploadMiddleware(): multer.Multer;
 /**
  * Pre-multer middleware: reject any request whose declared `Content-Length`
  * exceeds {@link MAX_UPLOAD_TOTAL_SIZE} before we spend time streaming bytes

package/dist/daemon/utils/upload.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"upload.d.ts","sourceRoot":"","sources":["../../src/utils/upload.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAKH,OAAO,KAAK,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAEzE,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC/D,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B;;;;;;;;GAQG;AACH,eAAO,MAAM,yBAAyB,EAAE,WAAW,CAAC,MAAM,CAoBxD,CAAC;AAEH,kDAAkD;AAClD,eAAO,MAAM,oBAAoB,QAAmB,CAAC;AACrD,yDAAyD;AACzD,eAAO,MAAM,4BAA4B,KAAK,CAAC;AAC/C,kEAAkE;AAClE,eAAO,MAAM,qBAAqB,QAAoB,CAAC;AAKvD;;GAEG;AACH,MAAM,MAAM,iBAAiB,GAAG,QAAQ,GAAG,MAAM,GAAG,QAAQ,CAAC;AAE7D;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,iBAAiB,EAAE,UAAU,EAAE,gBAAgB,wBAgG/F;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,WAAW,EAAE,iBAAiB,EAC9B,UAAU,EAAE,gBAAgB,iBAuC7B;AAED;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,KAC5B,KAAK,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,KAAG,IAAI,CAY/D;AAED;;;;;;;GAOG;AACH,wBAAgB,4BAA4B,KAC5B,KAAK,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,KAAG,OAAO,CAAC,IAAI,CAAC,CAoB9E"}
+{"version":3,"file":"upload.d.ts","sourceRoot":"","sources":["../../src/utils/upload.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC/D,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B;;;;;;;;GAQG;AACH,eAAO,MAAM,yBAAyB,EAAE,WAAW,CAAC,MAAM,CAoBxD,CAAC;AAEH,kDAAkD;AAClD,eAAO,MAAM,oBAAoB,QAAmB,CAAC;AACrD,yDAAyD;AACzD,eAAO,MAAM,4BAA4B,KAAK,CAAC;AAC/C,kEAAkE;AAClE,eAAO,MAAM,qBAAqB,QAAoB,CAAC;AAOvD;;GAEG;AACH,wBAAgB,kBAAkB,IAAI,MAAM,CAE3C;AAED,wBAAgB,8BAA8B,CAAC,WAAW,EAAE,OAAO,GAAG,IAAI,CAiBzE;AAED;;GAEG;AACH,wBAAgB,mBAAmB,yBA6DlC;AAED;;GAEG;AACH,wBAAgB,sBAAsB,kBAsCrC;AAED;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,KAC5B,KAAK,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,KAAG,IAAI,CAY/D;AAED;;;;;;;GAOG;AACH,wBAAgB,4BAA4B,KAC5B,KAAK,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,KAAG,OAAO,CAAC,IAAI,CAAC,CAoB9E"}

package/dist/daemon/utils/upload.js

@@ -1,8 +1,7 @@
 // src/utils/upload.ts
 import fs from "fs/promises";
-import os from "os";
 import path from "path";
-import { shortId } from "@agor/core/db";
+import { getAgorHome } from "@agor/core/config";
 import multer from "multer";
 var ALLOWED_UPLOAD_MIME_TYPES = /* @__PURE__ */ new Set([
   // Images
@@ -29,46 +28,38 @@ var MAX_UPLOAD_FILE_SIZE = 50 * 1024 * 1024;
 var MAX_UPLOAD_FILES_PER_REQUEST = 10;
 var MAX_UPLOAD_TOTAL_SIZE = 100 * 1024 * 1024;
 var DEBUG_UPLOAD = process.env.NODE_ENV !== "production";
-function createUploadStorage(sessionRepo, branchRepo) {
+var LEGACY_IGNORED_UPLOAD_DESTINATIONS = /* @__PURE__ */ new Set(["branch", "global"]);
+function getUploadDirectory() {
+  return path.join(getAgorHome(), "uploads");
+}
+function validateUploadDestinationQuery(destination) {
+  if (destination == null || destination === "") return;
+  if (Array.isArray(destination)) {
+    throw Object.assign(new Error("Upload destination options are no longer supported"), {
+      status: 400
+    });
+  }
+  const value = String(destination);
+  if (LEGACY_IGNORED_UPLOAD_DESTINATIONS.has(value)) return;
+  throw Object.assign(
+    new Error(
+      `Upload destination '${value}' is no longer supported; uploads are stored in ~/.agor/uploads/`
+    ),
+    { status: 400 }
+  );
+}
+function createUploadStorage() {
   const storage = multer.diskStorage({
     destination: async (req, _file, cb) => {
       try {
         const { sessionId } = req.params;
-        const destination = req.query.destination || "branch";
-        if (!["branch", "temp", "global"].includes(destination)) {
-          console.error(`\u274C [Upload Storage] Invalid destination: ${destination}`);
-          return cb(new Error(`Invalid destination: ${destination}`), "");
-        }
+        validateUploadDestinationQuery(req.query.destination);
         if (DEBUG_UPLOAD) {
           console.log(
-            `\u{1F4C2} [Upload Storage] Processing upload for session ${sessionId ? shortId(sessionId) : "unknown"}`
+            `\u{1F4C2} [Upload Storage] Processing upload for session ${sessionId || "unknown"}`
           );
-          console.log(`   Destination type: ${destination}`);
-        }
-        if (!sessionId) {
-          console.error("\u274C [Upload Storage] No session ID provided");
-          return cb(new Error("Session ID required"), "");
-        }
-        const session = await sessionRepo.findById(sessionId);
-        if (!session) {
-          console.error(`\u274C [Upload Storage] Session not found: ${shortId(sessionId)}`);
-          return cb(new Error(`Session not found: ${sessionId}`), "");
-        }
-        if (!session.branch_id) {
-          console.error(`\u274C [Upload Storage] Session ${shortId(sessionId)} has no branch`);
-          return cb(new Error(`Session ${sessionId} has no associated branch`), "");
-        }
-        const branch = await branchRepo.findById(session.branch_id);
-        if (!branch) {
-          console.error(`\u274C [Upload Storage] Branch not found: ${shortId(session.branch_id)}`);
-          return cb(new Error(`Branch not found: ${session.branch_id}`), "");
         }
-        const paths = {
-          branch: path.join(branch.path, ".agor", "uploads"),
-          temp: path.join(os.tmpdir(), "agor-uploads"),
-          global: path.join(os.homedir(), ".agor", "uploads")
-        };
-        const dest = paths[destination] || paths.branch;
+        const dest = getUploadDirectory();
         if (DEBUG_UPLOAD) console.log(`\u{1F4C1} [Upload Storage] Target directory: ${dest}`);
         await fs.mkdir(dest, { recursive: true });
         if (DEBUG_UPLOAD) console.log(`\u2705 [Upload Storage] Directory created/verified: ${dest}`);
@@ -95,8 +86,8 @@ function createUploadStorage(sessionRepo, branchRepo) {
   });
   return storage;
 }
-function createUploadMiddleware(sessionRepo, branchRepo) {
-  const storage = createUploadStorage(sessionRepo, branchRepo);
+function createUploadMiddleware() {
+  const storage = createUploadStorage();
   return multer({
     storage,
     limits: {
@@ -169,5 +160,7 @@ export {
   createUploadMiddleware,
   createUploadStorage,
   enforceParsedTotalUploadSize,
-  enforceTotalUploadSize
+  enforceTotalUploadSize,
+  getUploadDirectory,
+  validateUploadDestinationQuery
 };

package/dist/daemon/widgets/env-vars/index.d.ts

@@ -11,6 +11,18 @@
  */
 import { z } from 'zod';
 import { type WidgetRegistryEntry } from '../registry.js';
+declare const envVarFieldMetadataSchema: z.ZodObject<{
+    description: z.ZodOptional<z.ZodString>;
+    placeholder: z.ZodOptional<z.ZodString>;
+    format_hint: z.ZodOptional<z.ZodString>;
+    input_type: z.ZodOptional<z.ZodDefault<z.ZodEnum<{
+        text: "text";
+        password: "password";
+        textarea: "textarea";
+    }>>>;
+}, z.core.$strict>;
+export type EnvVarFieldMetadata = z.infer<typeof envVarFieldMetadataSchema>;
+export declare function normalizeEnvVarsParams(params: EnvVarsParams): EnvVarsParams;
 /**
  * Agent-provided params (validated when the MCP tool fires).
  * Stored at `metadata.widget.params` on the widget message row.
@@ -18,6 +30,16 @@ import { type WidgetRegistryEntry } from '../registry.js';
 export declare const envVarsParamsSchema: z.ZodObject<{
     names: z.ZodArray<z.ZodString>;
     reason: z.ZodString;
+    variable_metadata: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
+        description: z.ZodOptional<z.ZodString>;
+        placeholder: z.ZodOptional<z.ZodString>;
+        format_hint: z.ZodOptional<z.ZodString>;
+        input_type: z.ZodOptional<z.ZodDefault<z.ZodEnum<{
+            text: "text";
+            password: "password";
+            textarea: "textarea";
+        }>>>;
+    }, z.core.$strict>>>;
     auto_resume: z.ZodDefault<z.ZodBoolean>;
 }, z.core.$strip>;
 export type EnvVarsParams = z.infer<typeof envVarsParamsSchema>;
@@ -25,7 +47,8 @@ export type EnvVarsParams = z.infer<typeof envVarsParamsSchema>;
  * Browser → daemon submit payload. Direct HTTP, never reaches the agent.
  */
 export declare const envVarsSubmitSchema: z.ZodObject<{
-    values: z.ZodRecord<z.ZodString, z.ZodString>;
+    values: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodString>>;
+    use_existing: z.ZodDefault<z.ZodArray<z.ZodString>>;
     scope: z.ZodEnum<{
         session: "session";
         global: "global";
@@ -39,9 +62,11 @@ export type EnvVarsSubmit = z.infer<typeof envVarsSubmitSchema>;
  */
 export interface EnvVarsResultMeta {
     names_submitted: string[];
+    names_used_existing?: string[];
     scope: 'global' | 'session';
 }
 export declare const envVarsWidget: WidgetRegistryEntry<EnvVarsParams, EnvVarsSubmit, EnvVarsResultMeta>;
 /** Idempotent registration helper, safe to call at every daemon boot. */
 export declare function registerEnvVarsWidget(): void;
+export {};
 //# sourceMappingURL=index.d.ts.map

package/dist/daemon/widgets/env-vars/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/widgets/env-vars/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAKH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAkB,KAAK,mBAAmB,EAAwB,MAAM,gBAAgB,CAAC;AAKhG;;;GAGG;AACH,eAAO,MAAM,mBAAmB;;;;iBAsB9B,CAAC;AAEH,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAEhE;;GAEG;AACH,eAAO,MAAM,mBAAmB;;;;;;iBAU9B,CAAC;AAEH,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAEhE;;;;GAIG;AACH,MAAM,WAAW,iBAAiB;IAChC,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,KAAK,EAAE,QAAQ,GAAG,SAAS,CAAC;CAC7B;AAsFD,eAAO,MAAM,aAAa,EAAE,mBAAmB,CAAC,aAAa,EAAE,aAAa,EAAE,iBAAiB,CAiB9F,CAAC;AAEF,yEAAyE;AACzE,wBAAgB,qBAAqB,IAAI,IAAI,CAE5C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/widgets/env-vars/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAWH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAkB,KAAK,mBAAmB,EAAwB,MAAM,gBAAgB,CAAC;AAShG,QAAA,MAAM,yBAAyB;;;;;;;;;kBAOpB,CAAC;AAEZ,MAAM,MAAM,mBAAmB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,yBAAyB,CAAC,CAAC;AAW5E,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,aAAa,GAAG,aAAa,CAM3E;AAED;;;GAGG;AACH,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;iBAyC5B,CAAC;AAEL,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAEhE;;GAEG;AACH,eAAO,MAAM,mBAAmB;;;;;;;iBAwC5B,CAAC;AAEL,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAEhE;;;;GAIG;AACH,MAAM,WAAW,iBAAiB;IAChC,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC/B,KAAK,EAAE,QAAQ,GAAG,SAAS,CAAC;CAC7B;AA6ID,eAAO,MAAM,aAAa,EAAE,mBAAmB,CAAC,aAAa,EAAE,aAAa,EAAE,iBAAiB,CA+B9F,CAAC;AAEF,yEAAyE;AACzE,wBAAgB,qBAAqB,IAAI,IAAI,CAE5C"}