@notis_ai/cli 0.2.2 → 0.2.3

package/src/runtime/transport.js

@@ -1,4 +1,5 @@
 import { randomUUID } from 'node:crypto';
+import { createReadStream } from 'node:fs';
 import { CliError, EXIT_CODES } from './errors.js';
 import {
   DEFAULT_PROFILE,
@@ -8,31 +9,71 @@ import {
   saveConfig,
 } from './profiles.js';
 
-const META_TOOL_NAMES = new Set([
-  'notis_find_toolkits',
-  'notis_find_tools',
-  'notis_execute_tool',
-  'notis_find_additional_tools',
-]);
-
-function canonicalizeToolName(toolName) {
-  if (typeof toolName !== 'string' || !toolName.length) {
-    return toolName;
-  }
+function escapeMultipartHeaderValue(value) {
+  return String(value ?? '')
+    .replace(/"/g, '%22')
+    .replace(/\r/g, '%0D')
+    .replace(/\n/g, '%0A');
+}
 
-  if (META_TOOL_NAMES.has(toolName) || toolName.startsWith('notis-default-')) {
-    return toolName;
-  }
+function multipartTextPart(boundary, name, value) {
+  return [
+    `--${boundary}`,
+    `Content-Disposition: form-data; name="${escapeMultipartHeaderValue(name)}"`,
+    '',
+    value,
+    '',
+  ].join('\r\n');
+}
 
-  if (toolName.startsWith('notis_')) {
-    return `notis-default-${toolName.slice('notis_'.length)}`;
-  }
+function multipartFileHeader(boundary, binding) {
+  const filename = escapeMultipartHeaderValue(binding.basename || binding.field_name);
+  return [
+    `--${boundary}`,
+    `Content-Disposition: form-data; name="${escapeMultipartHeaderValue(binding.field_name)}"; filename="${filename}"`,
+    `Content-Type: ${binding.contentType || 'application/octet-stream'}`,
+    '',
+    '',
+  ].join('\r\n');
+}
 
-  if (toolName.includes('_notis_')) {
-    return `notis-default-${toolName.replace(/_notis_/g, '_')}`;
+async function* multipartFileBody(boundary, payload, bindingMetadata, fileBindings) {
+  yield Buffer.from(multipartTextPart(boundary, 'payload', JSON.stringify(payload)));
+  yield Buffer.from(multipartTextPart(boundary, 'file_bindings', JSON.stringify(bindingMetadata)));
+  for (const binding of fileBindings) {
+    yield Buffer.from(multipartFileHeader(boundary, binding));
+    for await (const chunk of createReadStream(binding.localPath)) {
+      yield chunk;
+    }
+    yield Buffer.from('\r\n');
   }
+  yield Buffer.from(`--${boundary}--\r\n`);
+}
 
-  return toolName;
+function createMultipartFileUpload(payload, bindingMetadata, fileBindings) {
+  const boundary = `----notis-cli-${randomUUID().replace(/-/g, '')}`;
+  const textParts = [
+    multipartTextPart(boundary, 'payload', JSON.stringify(payload)),
+    multipartTextPart(boundary, 'file_bindings', JSON.stringify(bindingMetadata)),
+  ];
+  const fileHeaderParts = fileBindings.map((binding) => multipartFileHeader(boundary, binding));
+  const closingPart = `--${boundary}--\r\n`;
+  const contentLength = [
+    ...textParts,
+    ...fileHeaderParts,
+    ...fileBindings.map(() => '\r\n'),
+    closingPart,
+  ].reduce((total, part) => total + Buffer.byteLength(part), 0)
+    + fileBindings.reduce((total, binding) => total + binding.size, 0);
+
+  return {
+    body: multipartFileBody(boundary, payload, bindingMetadata, fileBindings),
+    headers: {
+      'Content-Type': `multipart/form-data; boundary=${boundary}`,
+      'Content-Length': String(contentLength),
+    },
+    duplex: 'half',
+  };
 }
 
 function normalizeBackendError(status, payload) {
@@ -197,6 +238,7 @@ export async function httpRequest({
   method = 'POST',
   path,
   body,
+  multipart = false,
   requireAuth = true,
 }) {
   await maybeRefreshDevPortalAuth(runtime);
@@ -211,21 +253,41 @@ export async function httpRequest({
   };
 
   const headers = {
-    'Content-Type': 'application/json',
     'X-Notis-CLI-Version': runtime.cliVersion,
     'X-Notis-Request-Id': requestId,
   };
+  if (!multipart) {
+    headers['Content-Type'] = 'application/json';
+  }
 
   if (requireAuth && runtime.jwt) {
     headers.Authorization = `Bearer ${runtime.jwt}`;
   }
 
+  const resolveBody = () => {
+    if (!multipart) {
+      return {
+        body: body ? JSON.stringify(body) : undefined,
+        headers: {},
+      };
+    }
+    if (typeof body === 'function') {
+      return body();
+    }
+    return {
+      body,
+      headers: {},
+    };
+  };
+
   try {
+    let requestBody = resolveBody();
     let response = await fetch(`${runtime.apiBase}${path}`, {
       method,
-      headers,
-      body: body ? JSON.stringify(body) : undefined,
+      headers: { ...headers, ...requestBody.headers },
+      body: requestBody.body,
       signal: controller.signal,
+      ...(requestBody.duplex ? { duplex: requestBody.duplex } : {}),
     });
 
     let payload = null;
@@ -243,11 +305,13 @@ export async function httpRequest({
           headers.Authorization = `Bearer ${runtime.jwt}`;
         }
         resetTimeout();
+        requestBody = resolveBody();
         response = await fetch(`${runtime.apiBase}${path}`, {
           method,
-          headers,
-          body: body ? JSON.stringify(body) : undefined,
+          headers: { ...headers, ...requestBody.headers },
+          body: requestBody.body,
           signal: controller.signal,
+          ...(requestBody.duplex ? { duplex: requestBody.duplex } : {}),
         });
         try {
           payload = await response.json();
@@ -302,22 +366,43 @@ export async function callTool({
   toolName,
   arguments_: argumentsPayload = {},
   idempotencyKey,
+  fileBindings = [],
 }) {
   const requestId = idempotencyKey || (runtime.mutating ? randomUUID() : null);
+  const payload = {
+    tool_name: toolName,
+    arguments: argumentsPayload,
+    idempotency_key: requestId,
+    cli_context: {
+      output_mode: runtime.outputMode,
+      profile: runtime.profileName,
+      cwd: process.cwd(),
+      agent_mode: runtime.agentMode,
+      cli_version: runtime.cliVersion,
+    },
+  };
+
+  if (Array.isArray(fileBindings) && fileBindings.length) {
+    const bindingMetadata = fileBindings.map((binding) => {
+      const {
+        contentType,
+        localPath,
+        ...metadata
+      } = binding;
+      return metadata;
+    });
+
+    return httpRequest({
+      runtime,
+      path: '/cli_tools',
+      body: () => createMultipartFileUpload(payload, bindingMetadata, fileBindings),
+      multipart: true,
+    });
+  }
+
   return httpRequest({
     runtime,
     path: '/cli_tools',
-    body: {
-      tool_name: canonicalizeToolName(toolName),
-      arguments: argumentsPayload,
-      idempotency_key: requestId,
-      cli_context: {
-        output_mode: runtime.outputMode,
-        profile: runtime.profileName,
-        cwd: process.cwd(),
-        agent_mode: runtime.agentMode,
-        cli_version: runtime.cliVersion,
-      },
-    },
+    body: payload,
   });
 }

package/template/app/page.tsx

@@ -25,7 +25,7 @@ type QueryItemsResult = {
 
 export default function HomePage() {
   const { app, ready } = useNotis();
-  const queryItems = useTool<QueryItemsArgs, QueryItemsResult>('notis-default-query');
+  const queryItems = useTool<QueryItemsArgs, QueryItemsResult>('LOCAL_NOTIS_DATABASE_QUERY');
   const [documents, setDocuments] = useState<ItemDocument[]>([]);
 
   useEffect(() => {

package/template/notis.config.ts

@@ -32,6 +32,6 @@ export default defineNotisApp({
   ],
 
   tools: [
-    'notis-default-query',
+    'LOCAL_NOTIS_DATABASE_QUERY',
   ],
 });

package/template/packages/sdk/src/hooks/useTool.ts

@@ -25,7 +25,7 @@ export interface UseToolResult<
  * Call a specific Notis tool by name.
  *
  * ```tsx
- * const { call, loading } = useTool('notis-default-web_search');
+ * const { call, loading } = useTool('LOCAL_NOTIS_WEB_SEARCH');
  * const result = await call({ query: 'latest news' });
  * ```
  */