@notis_ai/cli 0.2.1 → 0.2.2

package/src/command-specs/tools.js

@@ -171,37 +171,6 @@ async function toolsExecHandler(ctx) {
 
   const idempotencyKey = nextIdempotencyKey(ctx.globalOptions);
 
-  if (ctx.options.watch) {
-    const intervalSec = Math.max(1, parseInt(ctx.options.watch, 10));
-    const intervalMs = intervalSec * 1000;
-    process.on('SIGINT', () => process.exit(0));
-
-    while (true) {
-      try {
-        const result = await runToolCommand({
-          runtime: ctx.runtime,
-          toolName: 'notis_execute_tool',
-          arguments_: {
-            tool_name: ctx.args.toolName,
-            arguments: args,
-            ...(toolkits.length ? { toolkits } : {}),
-          },
-          mutating: true,
-          idempotencyKey: nextIdempotencyKey(ctx.globalOptions),
-        });
-        ctx.output.emitSuccess({
-          command: ctx.spec.command_path.join(' '),
-          data: result.payload,
-          humanSummary: `[${new Date().toISOString()}] ${ctx.args.toolName}`,
-          renderHuman: () => JSON.stringify(result.payload, null, 2),
-        });
-      } catch (error) {
-        process.stderr.write(`[${new Date().toISOString()}] Error: ${error.message}\n`);
-      }
-      await new Promise((r) => setTimeout(r, intervalMs));
-    }
-  }
-
   const result = await runToolCommand({
     runtime: ctx.runtime,
     toolName: 'notis_execute_tool',
@@ -359,17 +328,16 @@ export const toolsCommandSpecs = [
         { flags: '--arguments <json>', description: 'JSON object, @file path, or - for stdin.' },
         { flags: '--get-schema', description: 'Display the tool parameter schema without executing.' },
         { flags: '--dry-run', description: 'Validate arguments against the tool schema without executing.' },
-        { flags: '--watch <seconds>', description: 'Re-execute on an interval and stream results.' },
         { flags: '--toolkits <csv-or-json>', description: 'Optional toolkit namespace(s) to use when resolving the tool.' },
       ],
     },
     examples: [
       'notis tools exec notis-default-query --arguments \'{"database_slug":"tasks","query":{}}\'',
+      'notis tools exec notis-default-get_database --arguments \'{"database_slug":"tasks"}\'',
       'notis tools exec notis-default-query --get-schema',
       'notis tools exec notis-default-query --dry-run --arguments \'{"database_slug":"tasks","query":{}}\'',
       'notis tools exec notis-default-query --arguments @query.json',
       'notis tools exec notis-default-query --arguments - < query.json',
-      'notis tools exec notis-default-query --watch 10 --arguments \'{"database_slug":"tasks","query":{}}\'',
     ],
     output_schema: 'Returns the raw tool execution payload.',
     mutates: true,

package/src/runtime/app-dev-server.js

@@ -23,6 +23,7 @@ import {
   exportNameFromPath,
   getBundleDir,
   loadAppConfig,
+  prepareArtifactBuild,
   readManifest,
 } from './app-platform.js';
 
@@ -77,6 +78,14 @@ function scriptJson(value) {
     .replace(/\u2029/g, '\\u2029');
 }
 
+function timingMs(startedAt) {
+  return Number(process.hrtime.bigint() - startedAt) / 1_000_000;
+}
+
+function formatTimingMs(value) {
+  return value.toFixed(value < 10 ? 2 : 1);
+}
+
 function readJsonFile(path) {
   if (!existsSync(path)) {
     return null;
@@ -105,8 +114,8 @@ function reactVersionFromPeer(peerRange) {
 function resolveHarnessReactVersion(projectDir) {
   const candidates = [
     join(projectDir, 'node_modules', '@notis', 'sdk', 'package.json'),
-    join(REPO_ROOT, 'packages', 'notis-sdk', 'package.json'),
-    join(CLI_ROOT, 'template', 'packages', 'notis-sdk', 'package.json'),
+    join(REPO_ROOT, 'packages', 'sdk', 'package.json'),
+    join(CLI_ROOT, 'template', 'packages', 'sdk', 'package.json'),
   ];
   for (const candidate of candidates) {
     const pkg = readJsonFile(candidate);
@@ -234,7 +243,7 @@ function renderHarnessHtml({ state, manifest, appConfig, route, harnessOptions }
 /**
  * Start the dev server for one or more apps.
  *
- * @param {{apps: Array<{slug: string, projectDir: string, appId?: string}>, port: number, watch?: boolean, harness?: { mode?: string, apiBase?: string, jwt?: string }, log?: (m: string) => void, logError?: (m: string) => void}} options
+ * @param {{apps: Array<{slug: string, projectDir: string, appId?: string, userId?: string}>, port: number, watch?: boolean, harness?: { mode?: string, apiBase?: string, jwt?: string }, log?: (m: string) => void, logError?: (m: string) => void}} options
  */
 export async function startAppDevServer({
   apps,
@@ -254,6 +263,7 @@ export async function startAppDevServer({
       slug: app.slug,
       projectDir: app.projectDir,
       appId: app.appId || null,
+      userId: app.userId || null,
       canonicalBundleDir: getBundleDir(app.projectDir),
       bundleDir: null,
       jsPath: null,
@@ -381,11 +391,21 @@ export async function startAppDevServer({
     }
 
     if (url.pathname === '/healthz') {
+      const now = new Date().toISOString();
+      const sessions = Array.from(appState.values()).map((state) => ({
+        appId: state.appId,
+        userId: state.userId,
+        devSlug: state.slug,
+        bundleBaseUrl: `http://127.0.0.1:${port}/a/${state.slug}`,
+        projectDir: state.projectDir,
+        lastHeartbeatAt: now,
+        status: 'connected',
+      }));
       res.writeHead(200, {
         ...headers,
         'Content-Type': 'application/json; charset=utf-8',
       });
-      res.end(JSON.stringify({ ok: true, apps: Array.from(appState.keys()) }));
+      res.end(JSON.stringify({ ok: true, apps: Array.from(appState.keys()), sessions }));
       return;
     }
 
@@ -454,17 +474,20 @@ export async function startAppDevServer({
     }
 
     if (routed.rest.startsWith('bundle/')) {
+      const startedAt = process.hrtime.bigint();
       updateBundleDir(state, resolveBundleDir(state));
       const rel = routed.rest.slice('bundle/'.length);
       if (!state.bundleDir) {
         res.writeHead(404, headers);
         res.end('not found');
+        log(`[notis apps timing] ${state.slug}: GET bundle/${rel} -> 404 in ${formatTimingMs(timingMs(startedAt))}ms`);
         return;
       }
       const full = safeJoin(state.bundleDir, rel);
       if (!full || !existsSync(full)) {
         res.writeHead(404, headers);
         res.end('not found');
+        log(`[notis apps timing] ${state.slug}: GET bundle/${rel} -> 404 in ${formatTimingMs(timingMs(startedAt))}ms`);
         return;
       }
       const ext = extFor(rel);
@@ -480,6 +503,10 @@ export async function startAppDevServer({
       } else {
         res.end(content);
       }
+      log(
+        `[notis apps timing] ${state.slug}: GET bundle/${rel} -> 200 ` +
+        `${content.byteLength}B in ${formatTimingMs(timingMs(startedAt))}ms`,
+      );
       return;
     }
 
@@ -527,6 +554,7 @@ export async function startAppDevServer({
 
   for (const state of appState.values()) {
     if (watch) {
+      await prepareArtifactBuild(state.projectDir);
       pollForBundleAndWatch(state);
 
       state.buildProcess = spawn('npm', ['run', 'build', '--', '--watch'], {