@notis_ai/cli 0.2.5 → 0.2.6

package/src/runtime/transport.js

@@ -3,11 +3,11 @@ import { createReadStream } from 'node:fs';
 import { CliError, EXIT_CODES } from './errors.js';
 import {
   DEFAULT_PROFILE,
-  ensureProfile,
   getProfile,
+  isJwtExpired,
   loadConfig,
-  saveConfig,
 } from './profiles.js';
+import { createExpiredAuthError, createInvalidAuthHints } from './desktop-auth.js';
 
 function escapeMultipartHeaderValue(value) {
   return String(value ?? '')
@@ -76,7 +76,7 @@ function createMultipartFileUpload(payload, bindingMetadata, fileBindings) {
   };
 }
 
-function normalizeBackendError(status, payload) {
+function normalizeBackendError(status, payload, runtime) {
   const backendError = payload?.error;
   const message =
     backendError?.message ||
@@ -91,10 +91,7 @@ function normalizeBackendError(status, payload) {
       message,
       exitCode: EXIT_CODES.auth,
       hints: [
-        {
-          command: 'Open the Notis desktop app and sign in',
-          reason: 'Open the Notis desktop app to refresh CLI auth, or set NOTIS_JWT',
-        },
+        ...createInvalidAuthHints(runtime),
       ],
       details: payload || {},
     });
@@ -145,46 +142,10 @@ function normalizeBackendError(status, payload) {
   });
 }
 
-function shouldAttemptDevPortalRefresh(runtime, { force = false } = {}) {
-  if (runtime.authMode !== 'dev_portal' || !runtime.refreshToken || !runtime.apiBase) {
-    return false;
-  }
-
-  if (force) {
-    return true;
-  }
-
-  if (typeof runtime.accessExpiresAt !== 'number' || runtime.accessExpiresAt <= 0) {
+function reloadJwtFromConfig(runtime) {
+  if (runtime.credentialSource === 'env') {
     return false;
   }
-
-  const thresholdSeconds = 60;
-  return runtime.accessExpiresAt - Math.floor(Date.now() / 1000) <= thresholdSeconds;
-}
-
-function persistDevPortalRuntimeAuth(runtime, session) {
-  const config = ensureProfile(loadConfig(), runtime.profileName || DEFAULT_PROFILE);
-  const profileName = runtime.profileName || DEFAULT_PROFILE;
-  config.current_profile = profileName;
-  config.profiles[profileName] = {
-    ...config.profiles[profileName],
-    jwt: session.access_token,
-    api_base: runtime.apiBase,
-    auth_mode: 'dev_portal',
-    refresh_token: session.refresh_token,
-    access_expires_at: session.access_expires_at,
-    refresh_expires_at: session.refresh_expires_at,
-  };
-  saveConfig(config);
-
-  runtime.jwt = session.access_token;
-  runtime.authMode = 'dev_portal';
-  runtime.refreshToken = session.refresh_token;
-  runtime.accessExpiresAt = session.access_expires_at;
-  runtime.refreshExpiresAt = session.refresh_expires_at;
-}
-
-function reloadJwtFromConfig(runtime) {
   const profileName = runtime.profileName || DEFAULT_PROFILE;
   let profile;
   try {
@@ -197,39 +158,8 @@ function reloadJwtFromConfig(runtime) {
     return false;
   }
   runtime.jwt = nextJwt;
-  runtime.authMode = profile.auth_mode;
-  runtime.refreshToken = profile.refresh_token;
-  runtime.accessExpiresAt = profile.access_expires_at;
-  runtime.refreshExpiresAt = profile.refresh_expires_at;
-  return true;
-}
-
-async function maybeRefreshDevPortalAuth(runtime, { force = false } = {}) {
-  if (!shouldAttemptDevPortalRefresh(runtime, { force })) {
-    return false;
-  }
-
-  const response = await fetch(`${runtime.apiBase}/portal_auth/dev-refresh`, {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
-      'X-Notis-CLI-Version': runtime.cliVersion,
-    },
-    body: JSON.stringify({ refresh_token: runtime.refreshToken }),
-  });
-
-  let payload = null;
-  try {
-    payload = await response.json();
-  } catch {
-    payload = null;
-  }
-
-  if (!response.ok || !payload?.session?.access_token || !payload?.session?.refresh_token) {
-    throw normalizeBackendError(response.status, payload);
-  }
-
-  persistDevPortalRuntimeAuth(runtime, payload.session);
+  runtime.desktopAppName = profile.desktop_app_name;
+  runtime.desktopPid = profile.desktop_pid;
   return true;
 }
 
@@ -241,7 +171,14 @@ export async function httpRequest({
   multipart = false,
   requireAuth = true,
 }) {
-  await maybeRefreshDevPortalAuth(runtime);
+  // The desktop renderer is the single owner of the rotating Supabase refresh
+  // token. Each CLI request only consumes the newest access token it synced to
+  // disk, avoiding refresh-token races between independent CLI processes and
+  // the running desktop session.
+  reloadJwtFromConfig(runtime);
+  if (requireAuth && isJwtExpired(runtime.jwt)) {
+    throw createExpiredAuthError(runtime);
+  }
 
   let controller = new AbortController();
   let timeout = setTimeout(() => controller.abort(), runtime.timeoutMs);
@@ -298,8 +235,7 @@ export async function httpRequest({
     }
 
     if (response.status === 401) {
-      const refreshed = (await maybeRefreshDevPortalAuth(runtime, { force: true }))
-        || reloadJwtFromConfig(runtime);
+      const refreshed = reloadJwtFromConfig(runtime) && !isJwtExpired(runtime.jwt);
       if (refreshed) {
         if (requireAuth && runtime.jwt) {
           headers.Authorization = `Bearer ${runtime.jwt}`;
@@ -324,7 +260,10 @@ export async function httpRequest({
     clearTimeout(timeout);
 
     if (!response.ok) {
-      throw normalizeBackendError(response.status, payload);
+      if (response.status === 401 && isJwtExpired(runtime.jwt)) {
+        throw createExpiredAuthError(runtime);
+      }
+      throw normalizeBackendError(response.status, payload, runtime);
     }
 
     return {

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

@@ -3,6 +3,11 @@
 <head>
   <meta charset="utf-8">
   <title>Notis App Harness</title>
+  <script>
+    const harnessTheme = new URLSearchParams(window.location.search).get('theme') === 'dark' ? 'dark' : 'light';
+    document.documentElement.classList.toggle('dark', harnessTheme === 'dark');
+    document.documentElement.dataset.theme = harnessTheme;
+  </script>
   <link rel="stylesheet" href="./bundle/app.css">
   <script type="importmap">
   {
@@ -14,8 +19,80 @@
     }
   }
   </script>
+  <link rel="preconnect" href="https://fonts.googleapis.com">
+  <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+  <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700&display=swap">
   <style>
-    body { margin: 0; font-family: system-ui, sans-serif; }
+    /*
+     * Portal-parity theme tokens. In production the portal copies its computed
+     * :root custom properties onto the app root, so app CSS written against
+     * hsl(var(--token)) resolves to the real portal palette. The harness mirrors
+     * the portal's light theme here so dev renders and listing screenshots look
+     * exactly like the app inside the portal. Keep in sync with
+     * portal/src/app/globals.css (:root).
+     */
+    :root {
+      color-scheme: light;
+      --background: 0 0% 100%;
+      --foreground: 222.2 84% 4.9%;
+      --card: 0 0% 100%;
+      --card-foreground: 222.2 84% 4.9%;
+      --popover: 0 0% 100%;
+      --popover-foreground: 222.2 84% 4.9%;
+      --primary: 222.2 47.4% 11.2%;
+      --primary-foreground: 210 40% 98%;
+      --secondary: 210 40% 96.1%;
+      --secondary-foreground: 222.2 47.4% 11.2%;
+      --muted: 210 40% 96.1%;
+      --muted-foreground: 0 0% 46.9%;
+      --accent: 210 40% 96.1%;
+      --accent-foreground: 222.2 47.4% 11.2%;
+      --destructive: 0 84.2% 60.2%;
+      --destructive-foreground: 210 40% 98%;
+      --border: 214.3 31.8% 91.4%;
+      --input: 214.3 31.8% 91.4%;
+      --ring: 222.2 84% 4.9%;
+      --radius: 0.5rem;
+      --chart-1: 210 100% 49%;
+      --chart-2: 173 58% 39%;
+      --chart-3: 197 37% 24%;
+      --chart-4: 43 74% 66%;
+      --chart-5: 27 87% 67%;
+    }
+    :root.dark {
+      color-scheme: dark;
+      --background: 0 0% 13%;
+      --foreground: 210 40% 98%;
+      --card: 0 0% 13%;
+      --card-foreground: 210 40% 98%;
+      --popover: 0 0% 13%;
+      --popover-foreground: 210 40% 98%;
+      --primary: 210 40% 98%;
+      --primary-foreground: 222.2 47.4% 11.2%;
+      --secondary: 0 0% 18%;
+      --secondary-foreground: 210 40% 98%;
+      --muted: 0 0% 18%;
+      --muted-foreground: 0 0% 65.1%;
+      --accent: 0 0% 18%;
+      --accent-foreground: 210 40% 98%;
+      --destructive: 0 84.2% 60.2%;
+      --destructive-foreground: 210 40% 98%;
+      --border: 0 0% 23.5%;
+      --input: 0 0% 23.5%;
+      --ring: 212.7 26.8% 83.9%;
+      --chart-1: 220 70% 50%;
+      --chart-2: 160 60% 45%;
+      --chart-3: 30 80% 55%;
+      --chart-4: 280 65% 60%;
+      --chart-5: 340 75% 55%;
+    }
+    body {
+      margin: 0;
+      font-family: 'Inter', system-ui, -apple-system, sans-serif;
+      background: hsl(var(--background));
+      color: hsl(var(--foreground));
+      -webkit-font-smoothing: antialiased;
+    }
     #harness-status { position: fixed; top: 0; left: 0; right: 0; padding: 4px 8px; font-size: 11px; background: #111; color: #0f0; font-family: ui-monospace, SFMono-Regular, Menlo, monospace; z-index: 9999; }
     #root { padding-top: 24px; min-height: 100vh; }
   </style>
@@ -29,6 +106,7 @@
     const mode = {{MODE}};
     const apiBase = {{API_BASE}};
     const jwt = {{JWT}};
+    const fixtures = {{FIXTURES}};
     const status = document.getElementById('harness-status');
     const setStatus = (msg, color = '#0f0') => {
       status.textContent = `harness: ${msg}`;
@@ -42,6 +120,7 @@
       mounted: false,
       mode,
       route: descriptor.route && descriptor.route.slug,
+      scenario: descriptor.context && descriptor.context.screenshotScenario,
     };
 
     window.addEventListener('error', (event) => {
@@ -118,15 +197,48 @@
         },
         callTool: async (name, args) => {
           record('callTool', { name, arguments: args || {} });
+          if (fixtures && fixtures.tools && Object.prototype.hasOwnProperty.call(fixtures.tools, name)) {
+            return structuredClone(fixtures.tools[name]);
+          }
           return { ok: true, result: null };
         },
         request: async (path, options) => {
           record('request', { path, options });
+          if (fixtures && fixtures.requests && Object.prototype.hasOwnProperty.call(fixtures.requests, path)) {
+            return structuredClone(fixtures.requests[path]);
+          }
           return null;
         },
       };
     }
 
+    const delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+
+    async function applyScenarioActions() {
+      const actions = fixtures && fixtures.scenario && Array.isArray(fixtures.scenario.actions)
+        ? fixtures.scenario.actions
+        : [];
+      for (const action of actions) {
+        if (action && action.type === 'wait') {
+          await delay(Math.max(0, Number(action.ms) || 0));
+          continue;
+        }
+        if (action && action.type === 'click' && typeof action.selector === 'string') {
+          const deadline = Date.now() + 5000;
+          let element = null;
+          while (!element && Date.now() < deadline) {
+            element = document.querySelector(action.selector);
+            if (!element) await delay(50);
+          }
+          if (!element || typeof element.click !== 'function') {
+            throw new Error(`Screenshot scenario could not click ${action.selector}`);
+          }
+          element.click();
+          await delay(Number(action.settle_ms) || 350);
+        }
+      }
+    }
+
     function liveRuntime() {
       return {
         ...stubRuntime(),
@@ -192,11 +304,21 @@
       window.__harness.renderStarted = true;
       createRoot(document.getElementById('root')).render(React.createElement(Root));
 
-      requestAnimationFrame(() => requestAnimationFrame(() => {
-        window.__harness.mounted = true;
-        const errors = window.__harness.errors.length;
-        const calls = window.__harness.runtimeCalls.length;
-        setStatus(`mounted (errors=${errors}, runtimeCalls=${calls})`, errors ? '#f55' : '#0f0');
+      requestAnimationFrame(() => requestAnimationFrame(async () => {
+        try {
+          await delay(500);
+          await applyScenarioActions();
+          window.__harness.mounted = true;
+          const errors = window.__harness.errors.length;
+          const calls = window.__harness.runtimeCalls.length;
+          setStatus(`mounted (errors=${errors}, runtimeCalls=${calls})`, errors ? '#f55' : '#0f0');
+        } catch (error) {
+          window.__harness.errors.push({
+            type: 'scenario',
+            message: error && error.message ? error.message : String(error),
+          });
+          setStatus(`scenario failed: ${error && error.message ? error.message : String(error)}`, '#f55');
+        }
       }));
     } catch (error) {
       window.__harness.errors.push({

package/template/CHANGELOG.md

@@ -0,0 +1,5 @@
+# App Changelog
+
+## [Initial Release] - {PR_MERGE_DATE}
+
+- First Store release.

package/template/app/page.tsx

@@ -1,47 +1,14 @@
 'use client';
 
-import { useEffect, useState } from 'react';
-import { useNotis, useTool } from '@notis/sdk';
+import { getDocumentPreview, useDocuments, useNotis } from '@notis/sdk';
 import { Badge } from '@/components/ui/badge';
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card';
 
-type ItemDocument = {
-  id?: string;
-  document_id?: string;
-  title?: string;
-  properties?: Record<string, unknown>;
-};
-
-type QueryItemsArgs = {
-  database_slug: string;
-  query: {
-    page_size?: number;
-  };
-};
-
-type QueryItemsResult = {
-  documents?: ItemDocument[];
-};
-
 export default function HomePage() {
   const { app, ready } = useNotis();
-  const queryItems = useTool<QueryItemsArgs, QueryItemsResult>('LOCAL_NOTIS_DATABASE_QUERY');
-  const [documents, setDocuments] = useState<ItemDocument[]>([]);
-
-  useEffect(() => {
-    let cancelled = false;
-    queryItems
-      .call({ database_slug: 'items', query: { page_size: 25 } })
-      .then((result) => {
-        if (!cancelled) setDocuments(result.documents || []);
-      })
-      .catch(() => {
-        if (!cancelled) setDocuments([]);
-      });
-    return () => {
-      cancelled = true;
-    };
-  }, [queryItems.call]);
+  // Documents come back normalized: plain property values, camelCase fields,
+  // and typed content (contentMarkdown / contentBlocknote / plainText).
+  const { documents, loading } = useDocuments('items', { pageSize: 25 });
 
   return (
     <main className="notis-app-shell space-y-6">
@@ -63,7 +30,7 @@ export default function HomePage() {
           <CardDescription>Use shadcn surfaces and portal tokens so the app feels native inside Notis.</CardDescription>
         </CardHeader>
         <CardContent>
-          {queryItems.loading ? (
+          {loading ? (
             <p className="text-sm text-muted-foreground">Loading...</p>
           ) : documents.length === 0 ? (
             <div className="rounded-xl border border-dashed border-border px-4 py-10 text-center text-sm text-muted-foreground">
@@ -72,13 +39,16 @@ export default function HomePage() {
           ) : (
             <div className="space-y-3">
               {documents.map((doc) => (
-                <div key={doc.id || doc.document_id || doc.title} className="rounded-xl border border-border bg-background px-4 py-3">
+                <div key={doc.id} className="rounded-xl border border-border bg-background px-4 py-3">
                   <div className="flex items-center justify-between gap-3">
                     <p className="font-medium">{doc.title || 'Untitled'}</p>
-                    {doc.properties?.status ? (
-                      <Badge variant="outline">{String(doc.properties.status)}</Badge>
+                    {typeof doc.properties.status === 'string' ? (
+                      <Badge variant="outline">{doc.properties.status}</Badge>
                     ) : null}
                   </div>
+                  <p className="mt-1 line-clamp-1 text-xs text-muted-foreground">
+                    {getDocumentPreview(doc)}
+                  </p>
                 </div>
               ))}
             </div>

package/template/notis.config.ts

@@ -8,7 +8,6 @@ export default defineNotisApp({
   author: { name: 'Notis User' },
   categories: ['Productivity'],
   tagline: 'A clean starting point for a focused workflow.',
-  versionNotes: 'Initial release.',
 
   databases: ['items'],