negotium 0.3.11 → 0.3.13

package/dist/main.js

@@ -1869,7 +1869,7 @@ var exports_version = {};
 __export(exports_version, {
   NEGOTIUM_VERSION: () => NEGOTIUM_VERSION
 });
-var NEGOTIUM_VERSION = "0.3.11";
+var NEGOTIUM_VERSION = "0.3.13";
 
 // ../../packages/core/src/agents/codex-native-multi-agent.ts
 import { spawn } from "child_process";
@@ -20499,7 +20499,8 @@ function gatewayPayloadHash(params, requestId, actorUserId) {
     requestId,
     params.allowAutoContinue ?? true,
     params.respond ?? true,
-    params.threadRootId ?? null
+    params.threadRootId ?? null,
+    params.attachments ?? []
   ])).digest("hex");
 }
 function submitRuntimeGatewayTurn(params) {
@@ -20512,6 +20513,10 @@ function submitRuntimeGatewayTurn(params) {
     return duplicateResult(existing, params, requestId, actorUserId, payloadHash);
   }
   const createdAt = new Date().toISOString();
+  const attachments2 = params.attachments?.map(resolveAttachmentByFileId);
+  if (attachments2?.some((attachment) => !attachment)) {
+    throw new Error("gateway attachment could not be resolved");
+  }
   const message = {
     id: randomUUID17(),
     topicId: params.topic.id,
@@ -20520,6 +20525,7 @@ function submitRuntimeGatewayTurn(params) {
     sourceAdapter: "runtime-gateway",
     sourceMessageId: params.clientMessageId,
     text: params.text,
+    ...attachments2?.length ? { attachments: attachments2 } : {},
     ...params.threadRootId ? { threadRootId: params.threadRootId } : {},
     createdAt
   };
@@ -20545,7 +20551,8 @@ function submitRuntimeGatewayTurn(params) {
             {
               prompt: params.text,
               actorUserId,
-              ...params.actorLabel ? { actorLabel: params.actorLabel } : {}
+              ...params.actorLabel ? { actorLabel: params.actorLabel } : {},
+              ...params.attachments?.length ? { attachments: params.attachments } : {}
             }
           ],
           allowAutoContinue: params.allowAutoContinue ?? true,
@@ -20592,6 +20599,7 @@ function submitRuntimeGatewayTurn(params) {
 }
 var RuntimeGatewayIdempotencyConflictError;
 var init_submit_runtime_gateway_turn = __esm(async () => {
+  init_file_hooks();
   await init_api_messages();
   await init_api_topics();
   await init_forum_db();
@@ -29814,6 +29822,46 @@ class NodeFileStore {
     storeLocalFileAsUpload: (absPath, access = {}) => this.store(absPath, access),
     deleteFilesForTopic: (topicId) => this.deleteForTopic(topicId)
   };
+  async storeUploadedFile(fileId, file, access) {
+    if (!FILE_ID_RE.test(fileId) || file.size > MAX_NODE_UPLOAD_BYTES)
+      return null;
+    this.#ensureDir();
+    const filename = basename10(file.name || "upload") || "upload";
+    const extension = safeExtension(filename);
+    const mimeType = file.type || MIME_BY_EXT2[extension] || "application/octet-stream";
+    const existing = this.#metadata(fileId);
+    if (existing) {
+      const matches = existing.filename === filename && existing.mimeType === mimeType && existing.sizeBytes === file.size && existing.ownerUserId === access.ownerUserId && existing.topicId === access.topicId && existsSync31(join40(this.uploadDir, existing.savedName));
+      return matches ? this.#attachment(fileId, existing) : null;
+    }
+    const savedName = `${fileId}${extension}`;
+    const savedPath = join40(this.uploadDir, savedName);
+    try {
+      const sizeBytes = await Bun.write(savedPath, file);
+      if (sizeBytes !== file.size)
+        throw new Error("incomplete upload write");
+      const metadata = {
+        filename,
+        mimeType,
+        sizeBytes,
+        savedName,
+        ownerUserId: access.ownerUserId,
+        topicId: access.topicId,
+        visibility: "private"
+      };
+      writeFileSync23(this.#metadataPath(fileId), JSON.stringify(metadata), { mode: 384 });
+      return this.#attachment(fileId, metadata);
+    } catch (error2) {
+      rmSync9(savedPath, { force: true });
+      rmSync9(this.#metadataPath(fileId), { force: true });
+      logger.warn({ err: error2, fileId }, "node files: failed to store gateway upload");
+      return null;
+    }
+  }
+  allows(fileId, access) {
+    const metadata = this.#metadata(fileId);
+    return Boolean(metadata && metadata.ownerUserId === access.ownerUserId && metadata.topicId === access.topicId && existsSync31(join40(this.uploadDir, metadata.savedName)));
+  }
   store(absPath, access = {}) {
     this.#ensureDir();
     const fileId = randomUUID24();
@@ -29822,7 +29870,7 @@ class NodeFileStore {
     const savedPath = join40(this.uploadDir, savedName);
     try {
       const stats = statSync18(absPath);
-      if (!stats.isFile() || stats.size > MAX_UPLOAD_BYTES)
+      if (!stats.isFile() || stats.size > MAX_NODE_UPLOAD_BYTES)
         return null;
       const metadata = {
         filename: basename10(absPath),
@@ -29875,10 +29923,10 @@ class NodeFileStore {
     }
   }
 }
-var MAX_UPLOAD_BYTES, FILE_ID_RE, MIME_BY_EXT2, nodeFileStore;
+var MAX_NODE_UPLOAD_BYTES, FILE_ID_RE, MIME_BY_EXT2, nodeFileStore;
 var init_files = __esm(async () => {
   await init_node_host();
-  MAX_UPLOAD_BYTES = 2 * 1024 * 1024 * 1024;
+  MAX_NODE_UPLOAD_BYTES = 2 * 1024 * 1024 * 1024;
   FILE_ID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
   MIME_BY_EXT2 = {
     ".csv": "text/csv",
@@ -30213,11 +30261,34 @@ function createNodeControlHandler(options) {
               "canonical-history-import",
               "canonical-topic-abort",
               "canonical-session-reset",
-              "canonical-session-compact"
+              "canonical-session-compact",
+              "canonical-input-files"
             ],
             cursor: latestRuntimeEventSeq()
           });
         }
+        if (req.method === "POST" && runtimePath === "/input-files") {
+          const form = await req.formData();
+          const topicId = requiredText(form.get("topicId"), "topicId");
+          const userId = requiredText(form.get("userId"), "userId");
+          const fileId = requiredText(form.get("fileId"), "fileId");
+          const file = form.get("file");
+          if (!(file instanceof File))
+            throw new ControlRequestError("file is required");
+          if (file.size > MAX_NODE_UPLOAD_BYTES)
+            return jsonError(413, "File too large");
+          const topic = getTopic(topicId);
+          if (!topic || !topicInRequestScope(req, topic) || !topic.participants.some((participant) => participant.userId === userId)) {
+            return jsonError(404, "Topic not found");
+          }
+          const attachment = await nodeFileStore.storeUploadedFile(fileId, file, {
+            topicId,
+            ownerUserId: userId
+          });
+          if (!attachment)
+            return jsonError(409, "File id is already bound to another upload");
+          return Response.json({ ok: true, v: NODE_RUNTIME_CONTRACT_VERSION, attachment }, { status: 201 });
+        }
         if (req.method === "POST" && runtimePath === "/turns") {
           const body = await bodyRecord(req);
           if (body.v !== NODE_RUNTIME_CONTRACT_VERSION)
@@ -30231,16 +30302,27 @@ function createNodeControlHandler(options) {
           const actorUserId = body.actorUserId === undefined ? undefined : requiredText(body.actorUserId, "actorUserId");
           const actorLabel = body.actorLabel === undefined ? undefined : requiredText(body.actorLabel, "actorLabel");
           const vaultUserId = body.vaultUserId === undefined ? undefined : requiredText(body.vaultUserId, "vaultUserId");
-          const text2 = requiredText(body.text, "text");
+          if (typeof body.text !== "string")
+            throw new ControlRequestError("text is required");
+          const text2 = body.text;
           const clientMessageId = requiredText(body.clientMessageId, "clientMessageId");
           const requestId = body.requestId === undefined ? undefined : requiredText(body.requestId, "requestId");
           const threadRootId = body.threadRootId === undefined ? undefined : requiredText(body.threadRootId, "threadRootId");
+          const attachments2 = body.attachments === undefined ? [] : Array.isArray(body.attachments) && body.attachments.every((value) => typeof value === "string" && value.trim()) ? body.attachments : (() => {
+            throw new ControlRequestError("attachments must be an array of file ids");
+          })();
+          if (!text2.trim() && attachments2.length === 0) {
+            throw new ControlRequestError("text or attachments required");
+          }
           const topic = getTopic(topicId);
           if (!topic)
             return jsonError(404, "Topic not found");
           if (!topic.participants.some((participant) => participant.userId === userId)) {
             return jsonError(404, "Topic not found");
           }
+          if (attachments2.some((fileId) => !nodeFileStore.allows(fileId, { topicId, ownerUserId: userId }))) {
+            return jsonError(404, "Attachment not found");
+          }
           if (threadRootId) {
             const root = getApiMessage(topicId, threadRootId);
             if (!root || root.deleted || root.threadRootId) {
@@ -30258,6 +30340,7 @@ function createNodeControlHandler(options) {
             requestId,
             allowAutoContinue: body.allowAutoContinue !== false,
             respond: body.respond !== false,
+            ...attachments2.length ? { attachments: attachments2 } : {},
             ...threadRootId ? { threadRootId } : {}
           });
           return Response.json({
@@ -45240,7 +45323,7 @@ function allowedRuntimePath(path, method) {
     return /^\/topics\/[^/]+(\/messages)?$/.test(path);
   }
   if (method === "POST") {
-    if (path === "/turns")
+    if (path === "/turns" || path === "/input-files")
       return true;
     if (path === "/topics")
       return true;
@@ -45359,7 +45442,7 @@ function localCapabilities() {
     runtimeVersion: RUNTIME_VERSION,
     features: {
       remoteAsk: true,
-      inputFiles: false,
+      inputFiles: true,
       outputFiles: true,
       visualBridge: true,
       askUserBridge: true,
@@ -46086,10 +46169,25 @@ function option2(args, name) {
   const index = args.indexOf(`--${name}`);
   return index >= 0 ? args[index + 1]?.trim() : undefined;
 }
-function localNodeNameDefault() {
-  const normalized = hostname2().trim().toLowerCase().replace(/\.local$/, "").replace(/[^a-z0-9._-]+/g, "-").replace(/^[-._]+|[-._]+$/g, "").slice(0, 32).replace(/[-._]+$/g, "");
+function normalizeNodeNameCandidate(raw) {
+  const normalized = raw.trim().toLowerCase().replace(/\.local$/, "").replace(/[^a-z0-9._-]+/g, "-").replace(/^[-._]+|[-._]+$/g, "").slice(0, 32).replace(/[-._]+$/g, "");
   return normalized || undefined;
 }
+function localNodeNameDefault() {
+  const configured = process.env.NEGOTIUM_NODE_NAME?.trim();
+  if (configured) {
+    const normalized = normalizeNodeNameCandidate(configured);
+    if (normalized)
+      return normalized;
+  }
+  const aiName = getGlobalAiName().trim();
+  if (aiName && aiName !== DEFAULT_AI_NAME) {
+    const normalized = normalizeNodeNameCandidate(aiName);
+    if (normalized)
+      return normalized;
+  }
+  return normalizeNodeNameCandidate(hostname2());
+}
 async function confirmEnrollment(message) {
   if (!process.stdin.isTTY)
     return false;
@@ -46122,13 +46220,12 @@ async function joinCommand(args) {
     try {
       const invite = parseEnrollmentInvite(code);
       const resuming = isEnrollmentPending(invite);
-      let nodeName = option2(args, "name") || localNodeNameDefault();
+      const nodeName = option2(args, "name") || localNodeNameDefault();
       if (resuming) {
         console.log(`Resuming interrupted Otium enrollment with ${invite.central}`);
       } else {
         const preview = await previewEnrollment(invite);
         const workspace = preview.preview?.workspace;
-        nodeName ||= preview.preview?.suggestedNodeName || undefined;
         console.log(`Otium workspace: ${workspace?.name ?? workspace?.slug ?? workspace?.id}`);
         console.log(`  central:   ${invite.central}`);
         console.log(`  transport: ${preview.preview?.transport ?? "relay"}`);
@@ -46181,6 +46278,7 @@ async function joinCommand(args) {
   console.log("\nnext: `negotium-otium serve` (mounts the otium peer routes automatically)");
 }
 var init_join_cli = __esm(async () => {
+  await init_src();
   await init_central();
   await init_enrollment();
   await init_join();
@@ -47227,4 +47325,4 @@ switch (command) {
   }
 }
 
-//# debugId=4271BDC4F3BBFD0764756E2164756E21
+//# debugId=28B32B58D5A6FD9664756E2164756E21