@notis_ai/cli 0.2.0-beta.175.1 → 0.2.0-beta.178.1

package/src/command-specs/reports.js

@@ -1,82 +1,93 @@
-import { readFileSync } from 'node:fs';
-import { resolve } from 'node:path';
-import { appsCommandSpecs } from './apps.js';
-import { buildArtifact, prepareAppRelease, resolveProjectDir } from '../runtime/app-platform.js';
+import { readFileSync, writeFileSync, rmSync } from 'node:fs';
+import { resolve, join } from 'node:path';
+import { appsCommandSpecs, appsInitHandler, appsBuildHandler, appsVerifyHandler } from './apps.js';
+import { buildArtifact, prepareAppRelease, resolveProjectDir, loadAppConfig } from '../runtime/app-platform.js';
 import { nextIdempotencyKey, runToolCommand } from './helpers.js';
 import { usageError, EXIT_CODES } from '../runtime/errors.js';
 
-const reuse = (command, name = command) => {
-  const spec = appsCommandSpecs.find(item => item.command_path.join(' ') === `apps ${command}`);
-  return {
-    ...spec,
+async function assertReportProject(ctx) {
+  const dir = resolveProjectDir(ctx.args.dir || '.');
+  if ((await loadAppConfig(dir)).kind !== 'report') throw usageError('Set kind: "report" in notis.config.ts. Reports have no app installation or owned resources.');
+  return dir;
+}
+
+async function initReport(ctx) {
+  const dir = resolveProjectDir(ctx.args.dir || `./${ctx.args.name.toLowerCase().replace(/[^a-z0-9]+/g, '-')}`);
+  const result = await appsInitHandler({ ...ctx, args: { ...ctx.args, dir }, options: {}, output: { emitSuccess: value => value } });
+  writeFileSync(join(dir, 'notis.config.ts'), `import { defineNotisApp } from '@notis/sdk/config';
+export default defineNotisApp({
+  kind: 'report', name: ${JSON.stringify(ctx.args.name)},
+  routes: [{ path: '/', slug: 'home', name: 'Report', default: true }],
+  tools: [],
+});
+`);
+  writeFileSync(join(dir, 'app/page.tsx'), `'use client';
+import { useNotis, NotisCommentBoundary } from '@notis/sdk';
+export default function Report() {
+  const { app } = useNotis();
+  return <NotisCommentBoundary><main className="notis-app-shell space-y-6">
+    <h1 className="text-2xl font-semibold">{app?.name || 'Report'}</h1>
+    <p className="text-muted-foreground">Your report is ready to build.</p>
+  </main></NotisCommentBoundary>;
+}
+`);
+  rmSync(join(dir, 'CHANGELOG.md'), { force: true });
+  return ctx.output.emitSuccess({ ...result, command: 'reports init', hints: [
+    { command: `cd ${dir} && npm install`, reason: 'Install dependencies' },
+    { command: `notis reports build ${dir}`, reason: 'Build the standalone report' },
+  ] });
+}
+
+const localReportCommand = (command, name = command) => {
+  const app = appsCommandSpecs.find(item => item.command_path.join(' ') === `apps ${command}`);
+  return { ...app, command_path: ['reports', name],
+    summary: `${name[0].toUpperCase() + name.slice(1)} a standalone live SDK report.`,
+    when_to_use: 'Author a private standalone document using the shared view runtime; no app or database is required.',
+    args_schema: { ...app.args_schema, options: [...(app.args_schema.options || []).filter(option => !['--listing', '--from <slug>'].includes(option.flags)), ...(command === 'verify' ? [{ flags: '--document-id <id>', description: 'Saved report for live verification.' }, { flags: '--expected-revision <revision>', description: 'Saved report revision for live verification.' }] : [])] },
+    examples: [`notis reports ${name} ${command === 'init' ? '"Weekly report" ./weekly-report' : './weekly-report'}`],
     handler: async ctx => {
-      const output = new Proxy(ctx.output, {
-        get(target, key) {
-          if (key === 'emitSuccess') return result => {
-            const value = { ...result, warnings: (result.warnings || []).filter(warning => !warning.startsWith('Store readiness:')) };
-            if (value.data?.listing) { value.data = { ...value.data }; delete value.data.listing; }
-            return target.emitSuccess(value);
-          };
-          const value = Reflect.get(target, key);
-          return typeof value === 'function' ? value.bind(target) : value;
-        },
-      });
-      return spec.handler({ ...ctx, options: { ...ctx.options, listing: false, ...(name === 'preview' ? { keepOpen: true } : {}) }, output });
-    },
-    command_path: ['reports', name],
-    summary: `${name[0].toUpperCase() + name.slice(1)} a record-owned SDK report locally.${name === 'preview' ? ' Keeps the preview server and browser session open.' : ''}`,
-    args_schema: {
-      ...spec.args_schema,
-      options: (spec.args_schema?.options || []).map(option => option.flags === '--listing'
-        ? { ...option, description: 'Ignored for reports; saving a report does not publish a Store listing.' }
-        : option),
+      if (command === 'init') return initReport(ctx);
+      await assertReportProject(ctx);
+      return (command === 'build' ? appsBuildHandler : appsVerifyHandler)({ ...ctx, options: { ...ctx.options, ...(name === 'preview' ? { keepOpen: true } : {}) } });
     },
-    examples: (spec.examples || []).filter(example => !example.includes('--listing')).map(example => example.replace(`apps ${command}`, `reports ${name}`)),
-    when_to_use: 'Author an independent report without deploying its owning app.',
   };
 };
 export const reportsCommandSpecs = [
-  reuse('init'), reuse('build'), reuse('verify'), reuse('verify', 'preview'),
+  localReportCommand('init'), localReportCommand('build'), localReportCommand('verify'), localReportCommand('verify', 'preview'),
   {
     command_path: ['reports', 'save'],
-    summary: 'Build, verify and save a report into an app-owned database record.',
-    when_to_use: 'Persist an independently authored report, not an app release.',
+    summary: 'Build, verify and save a standalone live report document.',
+    when_to_use: 'Persist an independently owned report, not an app release.',
     args_schema: {
       arguments: [{ token: '[dir]', key: 'dir', description: 'Report source directory.' }],
       options: [
-        { flags: '--database-id <id>', description: 'Required. Owning app database.' },
-        { flags: '--document-id <id>', description: 'Existing record to update or attach to.' },
-        { flags: '--attach', description: 'Attach to an existing non-view record.' },
-        { flags: '--expected-revision <revision>', description: 'Fresh view revision (0 for a record without a view).' },
-        { flags: '--title <title>', description: 'Required, including updates. Record title.' },
+        { flags: '--document-id <id>', description: 'Existing report document to update.' },
+        { flags: '--expected-revision <revision>', description: 'Current saved report revision; required for updates.' },
+        { flags: '--title <title>', description: 'Required, including updates. Document title.' },
         { flags: '--context-file <file>', description: 'Required. UTF-8 readable report content and structure.' },
-        { flags: '--properties-file <file>', description: 'JSON database property values keyed by name.' },
       ],
     },
-    examples: ['notis reports save ./weekly-report --database-id <id> --title \"Weekly review\" --context-file ./context.md'], mutates: true, idempotent: true,
+    examples: ['notis reports save ./weekly-report --title \"Weekly review\" --context-file ./context.md'], mutates: true, idempotent: true,
     backend_call: { type: 'tool', name: 'LOCAL_NOTIS_SAVE_REPORT' },
     async handler(ctx) {
-      const dir = resolveProjectDir(ctx.args.dir || '.');
-      if (!ctx.options.databaseId || !ctx.options.title || !ctx.options.contextFile) throw usageError('--database-id, --title and --context-file are required.');
-      if (ctx.options.documentId && (!/^\d+$/.test(String(ctx.options.expectedRevision ?? '')) || !Number.isSafeInteger(Number(ctx.options.expectedRevision)))) throw usageError('--expected-revision is required for update/attach.');
-      if (ctx.options.attach && !ctx.options.documentId) throw usageError('--attach requires --document-id.');
+      const dir = await assertReportProject(ctx);
+      if (!ctx.options.title || !ctx.options.contextFile) throw usageError('--title and --context-file are required.');
+      if (ctx.options.documentId && (!/^\d+$/.test(String(ctx.options.expectedRevision ?? '')) || !Number.isSafeInteger(Number(ctx.options.expectedRevision)))) throw usageError('--expected-revision is required for update.');
       const context = readFileSync(resolve(ctx.options.contextFile), 'utf8');
-      const properties = ctx.options.propertiesFile ? JSON.parse(readFileSync(resolve(ctx.options.propertiesFile), 'utf8')) : {};
       await buildArtifact(dir, { stdio: ctx.output.isMachineMode() ? 'pipe' : 'inherit' });
       const release = prepareAppRelease(dir);
       try {
         if (release.manifest.routes?.length !== 1) throw usageError('Reports require exactly one SDK route.');
         let verification;
-        const verify = appsCommandSpecs.find(item => item.command_path.join(' ') === 'apps verify');
-        const exit = await verify.handler({ ...ctx, args: { dir: release.projectDir }, options: { skipBuild: true, mode: 'stub' }, output: { ...ctx.output, isMachineMode: () => true, emitSuccess: value => { verification = value; } } });
+        const exit = await appsVerifyHandler({ ...ctx, args: { dir: release.projectDir }, options: { skipBuild: true, mode: 'stub' }, output: { ...ctx.output, isMachineMode: () => true, emitSuccess: value => { verification = value; } } });
         if (exit !== EXIT_CODES.ok || verification?.data?.status !== 'passed') throw usageError('Report verification failed; nothing saved.');
         const files = { ...release.files, ...Object.fromEntries(Object.entries(release.sourceFiles).map(([path, data]) => [`source/${path}`, data])) };
         const result = await runToolCommand({ runtime: { ...ctx.runtime, timeoutMs: Math.max(ctx.runtime.timeoutMs || 0, 90000) }, toolName: 'LOCAL_NOTIS_SAVE_REPORT', mutating: true,
           idempotencyKey: nextIdempotencyKey(ctx.globalOptions), arguments_: {
-            operation: ctx.options.attach ? 'attach' : ctx.options.documentId ? 'update' : 'create',
-            database_id: ctx.options.databaseId, title: ctx.options.title, properties,
+            operation: ctx.options.documentId ? 'update' : 'create',
+            title: ctx.options.title,
             ...(ctx.options.documentId ? { document_id: ctx.options.documentId, expected_revision: Number(ctx.options.expectedRevision) } : {}),
-            report: { schema: 'notis-report/v2', context, artifact: { manifest: release.manifest, files, encoding: 'base64' } },
+            report: { schema: 'notis-report/v3', context, artifact: { manifest: release.manifest, files, encoding: 'base64' } },
           } });
         if (!result?.payload?.document?.id || !result.payload.document.view_revision) throw usageError('Save returned no record identity. Read back before retrying; the outcome may be unknown.');
         return ctx.output.emitSuccess({ command: 'reports save', data: result.payload });

package/src/runtime/agent-browser.js

@@ -228,6 +228,7 @@ export async function runHarnessRoute({
   timeoutMs = 10_000,
   snapshotPath = null,
   designViewports = DEFAULT_DESIGN_VIEWPORTS,
+  waitForRuntime = false,
 }) {
   const opened = await runAgentBrowser(['--session', sessionName, 'open', url], {
     timeoutMs: Math.min(Math.max(timeoutMs, 5000), 30_000),
@@ -244,17 +245,21 @@ export async function runHarnessRoute({
   }
 
   const deadline = Date.now() + timeoutMs;
+  let readySince = null;
   while (Date.now() < deadline) {
     const lastRead = await readHarness(sessionName, 5000);
     if (!lastRead.ok) {
+      readySince = null;
       await delay(250);
       continue;
     }
     const harness = lastRead.harness;
-    if (harness?.mounted || (Array.isArray(harness?.errors) && harness.errors.length > 0)) {
-      await delay(250);
-      break;
-    }
+    if (Array.isArray(harness?.errors) && harness.errors.length > 0) break;
+    const pending = (harness?.runtimeCalls || []).some(call => call?.ok == null);
+    if (harness?.mounted && (!waitForRuntime || !pending)) {
+      readySince ??= Date.now();
+      if (Date.now() - readySince >= 250) break;
+    } else readySince = null;
     await delay(250);
   }
 
@@ -283,8 +288,8 @@ export async function runHarnessRoute({
     }
   }
 
-  const timedOut = !harness.mounted && Date.now() >= deadline;
   const runtimeCalls = Array.isArray(harness.runtimeCalls) ? harness.runtimeCalls : [];
+  const timedOut = (!harness.mounted || (waitForRuntime && runtimeCalls.some(call => call?.ok == null))) && Date.now() >= deadline;
 
   // Design assertions only mean something on a mounted route. Loading
   // placeholders are excused while a runtime call is still in flight.

package/src/runtime/app-platform.js

@@ -27,7 +27,7 @@ const BUNDLE_DIR = join(OUTPUT_DIR, 'bundle');
 const MANIFEST_FILE = join(OUTPUT_DIR, 'manifest.json');
 const METADATA_DIR = 'metadata';
 const CLI_ROOT = resolve(dirname(fileURLToPath(import.meta.url)), '../..');
-const TEMPLATE_SDK_DIR = join(CLI_ROOT, 'template', 'packages', 'sdk');
+const TEMPLATE_SDK_DIR = join(CLI_ROOT, 'dist', 'sdk');
 export const NOTIS_APP_CATEGORIES = [
   'Productivity',
   'Sales & Marketing',
@@ -286,13 +286,14 @@ export function detectProjectWarnings(projectDir, appConfig = null) {
     appConfig?.capabilities?.workspaceDatabases === 'read';
   if (
     appConfig
+    && appConfig.kind !== 'report'
     && !readsWorkspaceDatabases
     && (!Array.isArray(appConfig.databases) || appConfig.databases.length === 0)
   ) {
     warnings.push('No database references declared in notis.config.ts.');
   }
 
-  if (appConfig) {
+  if (appConfig && appConfig.kind !== 'report') {
     try {
       const listing = inspectListingReadiness(projectDir, appConfig);
       warnings.push(...listing.errors, ...listing.warnings);
@@ -813,6 +814,29 @@ export function generateManifest(appConfig, projectDir) {
     return entry;
   });
 
+  if (appConfig.kind === 'report') {
+    if (routes.length !== 1 || routes[0].collection || routes[0].resourceDeepLinks) {
+      throw usageError('Reports require one standalone route, without app collections or resource deep links.');
+    }
+    if (['databases', 'skills', 'automations', 'onboarding', 'tagline', 'categories', 'author', 'screenshots'].some(key => {
+      const value = appConfig[key];
+      return Array.isArray(value) ? value.length > 0 : Boolean(value);
+    })) throw usageError('Reports cannot own databases, skills, automations or Store metadata.');
+    if (Object.values(appConfig.capabilities || {}).some(value => value !== 'read')) {
+      throw usageError('Reports support read capabilities only; shell grants require an installed app.');
+    }
+    const databaseAccess = appConfig.databaseAccess || [];
+    if (!Array.isArray(databaseAccess) || databaseAccess.some(entry =>
+      !entry || !/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(entry.id || '') ||
+      !['read', 'write'].includes(entry.access)
+    )) throw usageError('databaseAccess entries require an existing database UUID and read/write access.');
+    return { kind: 'report', version: 1, spec_version: 4,
+      routes: routes.map(route => ({ ...route, default: true, tool_access: { base: { tools: appConfig.tools || [] } } })),
+      bundle: { js: 'bundle/app.js', css: 'bundle/app.css' },
+      tools: appConfig.tools || [], tool_bindings: normalizeAppToolBindings(appConfig.toolBindings),
+      capabilities: normalizeAppCapabilities(appConfig.capabilities), database_access: databaseAccess };
+  }
+
   // Database entries may be a bare slug (structure only) or an object opting
   // into shipping rows to installers. Normalize to the manifest's snake_case.
   const databases = (appConfig.databases || []).map((entry) => {
@@ -1847,7 +1871,7 @@ function listFilesRecursive(dir, base = dir, results = []) {
 /**
  * Keep an app's embedded `packages/sdk` copy identical to the SDK this CLI
  * ships. The copy is a mirror by contract (the parity test in the CLI keeps
- * the template in step with packages/sdk), so an app never edits it; before
+ * the bundled artifact generated from packages/sdk), so an app never edits it; before
  * this sync existed every app silently ran whatever SDK snapshot it was
  * scaffolded with and never received hook or style updates.
  *

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

@@ -80,7 +80,7 @@ function resolveHarnessReactVersion(projectDir) {
   const candidates = [
     join(projectDir, 'node_modules', '@notis', 'sdk', 'package.json'),
     join(REPO_ROOT, 'packages', 'sdk', 'package.json'),
-    join(CLI_ROOT, 'template', 'packages', 'sdk', 'package.json'),
+    join(CLI_ROOT, 'dist', 'sdk', 'package.json'),
   ];
   for (const candidate of candidates) {
     const pkg = readJsonFile(candidate);
@@ -164,6 +164,7 @@ function buildHarnessDescriptor({ state, manifest, appConfig, route, scenario =
   );
 
   return {
+    ...(state.resource ? { resource: state.resource } : {}),
     app: {
       id: state.appId || 'harness-app',
       slug: state.slug,

package/template/.harness/index.html.tmpl

@@ -207,8 +207,8 @@
     }
 
     async function runtimeQuery(body) {
-      if (!apiBase || !jwt || !descriptor.app || !descriptor.app.id) {
-        throw new Error('live harness mode requires apiBase, jwt, and app id');
+      if (!apiBase || !jwt || !(descriptor.resource?.kind === 'report' ? descriptor.resource.id : descriptor.app?.id)) {
+        throw new Error('live harness mode requires apiBase, jwt, and runtime resource identity');
       }
       const response = await fetch(`${String(apiBase).replace(/\/$/, '')}/portal_views/runtime_query`, {
         method: 'POST',
@@ -217,7 +217,9 @@
           Authorization: `Bearer ${jwt}`,
         },
         body: JSON.stringify({
-          app_id: descriptor.app.id,
+          ...(descriptor.resource?.kind === 'report'
+            ? { document_id: descriptor.resource.id, revision: descriptor.resource.revision }
+            : { app_id: descriptor.app.id }),
           route_slug: descriptor.route && descriptor.route.slug,
           ...body,
         }),
@@ -230,7 +232,10 @@
       if (!payload) {
         throw new Error(snippet ? `Runtime response was not JSON: ${snippet}` : 'Runtime response was empty');
       }
-      if (payload.status === 'error' || payload.error) {
+      if (payload.status === 'error' || payload.error || (descriptor.resource?.kind === 'report' && (
+        ['error', 'failed', 'failure'].includes(String(payload.status || '').trim().toLowerCase())
+        || payload.ok === false || payload.success === false || payload.successful === false
+      ))) {
         throw new Error(payload.message || payload.error || 'Runtime request failed');
       }
       return payload;
@@ -238,6 +243,7 @@
 
     function stubRuntime() {
       return {
+        resource: descriptor.resource,
         app: descriptor.app,
         route: descriptor.route,
         context: descriptor.context || {},
@@ -287,6 +293,7 @@
         request: async (path, options) => tracked(
           record('request', { path, options }),
           async () => {
+            if (descriptor.resource?.kind === 'report') throw new Error('Reports access data through declared tools.');
             if (fixtures && fixtures.requests && Object.prototype.hasOwnProperty.call(fixtures.requests, path)) {
               return structuredClone(fixtures.requests[path]);
             }
@@ -349,6 +356,7 @@
         request: async (path, options) => tracked(
           record('request', { path, options }),
           async () => {
+            if (descriptor.resource?.kind === 'report') throw new Error('Reports access data through declared tools.');
             const response = await fetch(`${String(apiBase).replace(/\/$/, '')}${path}`, {
               method: (options && options.method) || 'GET',
               headers: {

package/template/packages/sdk/tsconfig.json

@@ -1,16 +0,0 @@
-{
-  "compilerOptions": {
-    "types": ["node", "react", "react-dom"],
-    "target": "ES2022",
-    "module": "ESNext",
-    "moduleResolution": "bundler",
-    "jsx": "react-jsx",
-    "strict": true,
-    "esModuleInterop": true,
-    "skipLibCheck": true,
-    "declaration": true,
-    "outDir": "dist",
-    "rootDir": "src"
-  },
-  "include": ["src"]
-}