@dxos/plugin-script 0.6.10-staging.df1ee5d → 0.6.11-staging.a542fc9

package/dist/types/src/types/script.d.ts

@@ -6,11 +6,13 @@ declare const ScriptType_base: import("@dxos/echo-schema").AbstractTypedObject<{
     } & {
         id: string;
     }>;
+    description?: string | undefined;
     changed?: boolean | undefined;
 } & {
     id: string;
 }, S.Struct.Encoded<{
     name: S.optional<typeof S.String>;
+    description: S.optional<typeof S.String>;
     source: ref<{
         content: string;
     } & {
@@ -18,9 +20,13 @@ declare const ScriptType_base: import("@dxos/echo-schema").AbstractTypedObject<{
     }>;
     changed: S.optional<typeof S.Boolean>;
 }>>;
+/**
+ * Source script.
+ */
 export declare class ScriptType extends ScriptType_base {
 }
 declare const FunctionType_base: import("@dxos/echo-schema").AbstractTypedObject<{
+    name?: string | undefined;
     version: number;
     source?: import("@dxos/echo-schema").Ref<{
         name?: string | undefined;
@@ -29,6 +35,7 @@ declare const FunctionType_base: import("@dxos/echo-schema").AbstractTypedObject
         } & {
             id: string;
         }>;
+        description?: string | undefined;
         changed?: boolean | undefined;
     } & {
         id: string;
@@ -37,6 +44,7 @@ declare const FunctionType_base: import("@dxos/echo-schema").AbstractTypedObject
 } & {
     id: string;
 }, S.Struct.Encoded<{
+    name: S.optional<typeof S.String>;
     version: typeof S.Number;
     binding: S.optional<typeof S.String>;
     source: S.optional<ref<{
@@ -46,11 +54,15 @@ declare const FunctionType_base: import("@dxos/echo-schema").AbstractTypedObject
         } & {
             id: string;
         }>;
+        description?: string | undefined;
         changed?: boolean | undefined;
     } & {
         id: string;
     }>>;
 }>>;
+/**
+ * Function deployment.
+ */
 export declare class FunctionType extends FunctionType_base {
 }
 export {};

package/dist/types/src/types/script.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"script.d.ts","sourceRoot":"","sources":["../../../../src/types/script.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,GAAG,EAAE,CAAC,EAAe,MAAM,mBAAmB,CAAC;;;;;;;;;;;;;;;;;;;;AAGxD,qBAAa,UAAW,SAAQ,eAK9B;CAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEL,qBAAa,YAAa,SAAQ,iBAMhC;CAAG"}
+{"version":3,"file":"script.d.ts","sourceRoot":"","sources":["../../../../src/types/script.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,GAAG,EAAE,CAAC,EAAe,MAAM,mBAAmB,CAAC;;;;;;;;;;;;;;;;;;;;;;AAKxD;;GAEG;AACH,qBAAa,UAAW,SAAQ,eAQ9B;CAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEL;;GAEG;AACH,qBAAa,YAAa,SAAQ,iBAQhC;CAAG"}

package/dist/types/src/types/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/types/types.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,oBAAoB,EACpB,sBAAsB,EACtB,uBAAuB,EACvB,eAAe,EACf,oBAAoB,EACrB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAIxD,oBAAY,YAAY;IACtB,MAAM,kCAA4B;CACnC;AAED,MAAM,MAAM,oBAAoB,GAAG,eAAe,GAChD,sBAAsB,GACtB,oBAAoB,GACpB,uBAAuB,GACvB,oBAAoB,GACpB,cAAc,GACd,aAAa,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/types/types.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,oBAAoB,EACpB,sBAAsB,EACtB,uBAAuB,EACvB,eAAe,EACf,oBAAoB,EACrB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAIxD,oBAAY,YAAY;IACtB,MAAM,kCAA4B;CACnC;AAED,MAAM,MAAM,oBAAoB,GAAG,eAAe,GAChD,sBAAsB,GACtB,oBAAoB,GACpB,uBAAuB,GACvB,oBAAoB,GACpB,cAAc,GACd,aAAa,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-script",
-  "version": "0.6.10-staging.df1ee5d",
+  "version": "0.6.11-staging.a542fc9",
   "description": "Braneframe notebook plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -71,30 +71,31 @@
     "iso-did": "^1.6.0",
     "lodash.get": "^4.4.2",
     "prettier": "^3.2.4",
+    "react-syntax-highlighter": "^15.5.0",
     "typescript": "^5.5.4",
-    "@dxos/app-framework": "0.6.10-staging.df1ee5d",
-    "@dxos/async": "0.6.10-staging.df1ee5d",
-    "@dxos/client": "0.6.10-staging.df1ee5d",
-    "@dxos/client-protocol": "0.6.10-staging.df1ee5d",
-    "@dxos/crypto": "0.6.10-staging.df1ee5d",
-    "@dxos/debug": "0.6.10-staging.df1ee5d",
-    "@dxos/echo-schema": "0.6.10-staging.df1ee5d",
-    "@dxos/invariant": "0.6.10-staging.df1ee5d",
-    "@dxos/keys": "0.6.10-staging.df1ee5d",
-    "@dxos/log": "0.6.10-staging.df1ee5d",
-    "@dxos/plugin-client": "0.6.10-staging.df1ee5d",
-    "@dxos/plugin-markdown": "0.6.10-staging.df1ee5d",
-    "@dxos/plugin-graph": "0.6.10-staging.df1ee5d",
-    "@dxos/plugin-space": "0.6.10-staging.df1ee5d",
-    "@dxos/plugin-explorer": "0.6.10-staging.df1ee5d",
-    "@dxos/plugin-stack": "0.6.10-staging.df1ee5d",
-    "@dxos/protocols": "0.6.10-staging.df1ee5d",
-    "@dxos/react-client": "0.6.10-staging.df1ee5d",
-    "@dxos/plugin-theme": "0.6.10-staging.df1ee5d",
-    "@dxos/react-ui-editor": "0.6.10-staging.df1ee5d",
-    "@dxos/rpc": "0.6.10-staging.df1ee5d",
-    "@dxos/rpc-tunnel": "0.6.10-staging.df1ee5d",
-    "@dxos/util": "0.6.10-staging.df1ee5d"
+    "@dxos/app-framework": "0.6.11-staging.a542fc9",
+    "@dxos/client-protocol": "0.6.11-staging.a542fc9",
+    "@dxos/crypto": "0.6.11-staging.a542fc9",
+    "@dxos/client": "0.6.11-staging.a542fc9",
+    "@dxos/echo-schema": "0.6.11-staging.a542fc9",
+    "@dxos/invariant": "0.6.11-staging.a542fc9",
+    "@dxos/keys": "0.6.11-staging.a542fc9",
+    "@dxos/async": "0.6.11-staging.a542fc9",
+    "@dxos/debug": "0.6.11-staging.a542fc9",
+    "@dxos/log": "0.6.11-staging.a542fc9",
+    "@dxos/plugin-client": "0.6.11-staging.a542fc9",
+    "@dxos/plugin-explorer": "0.6.11-staging.a542fc9",
+    "@dxos/plugin-graph": "0.6.11-staging.a542fc9",
+    "@dxos/plugin-space": "0.6.11-staging.a542fc9",
+    "@dxos/plugin-markdown": "0.6.11-staging.a542fc9",
+    "@dxos/plugin-stack": "0.6.11-staging.a542fc9",
+    "@dxos/plugin-theme": "0.6.11-staging.a542fc9",
+    "@dxos/protocols": "0.6.11-staging.a542fc9",
+    "@dxos/react-client": "0.6.11-staging.a542fc9",
+    "@dxos/react-ui-editor": "0.6.11-staging.a542fc9",
+    "@dxos/rpc": "0.6.11-staging.a542fc9",
+    "@dxos/util": "0.6.11-staging.a542fc9",
+    "@dxos/rpc-tunnel": "0.6.11-staging.a542fc9"
   },
   "devDependencies": {
     "@phosphor-icons/react": "^2.1.5",
@@ -104,20 +105,20 @@
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "^5.3.4",
-    "@dxos/echo-generator": "0.6.10-staging.df1ee5d",
-    "@dxos/react-ui": "0.6.10-staging.df1ee5d",
-    "@dxos/random": "0.6.10-staging.df1ee5d",
-    "@dxos/react-ui-theme": "0.6.10-staging.df1ee5d",
-    "@dxos/react-ui-mosaic": "0.6.10-staging.df1ee5d",
-    "@dxos/storybook-utils": "0.6.10-staging.df1ee5d"
+    "@dxos/echo-generator": "0.6.11-staging.a542fc9",
+    "@dxos/random": "0.6.11-staging.a542fc9",
+    "@dxos/react-ui": "0.6.11-staging.a542fc9",
+    "@dxos/react-ui-mosaic": "0.6.11-staging.a542fc9",
+    "@dxos/storybook-utils": "0.6.11-staging.a542fc9",
+    "@dxos/react-ui-theme": "0.6.11-staging.a542fc9"
   },
   "optionalDependencies": {
     "@phosphor-icons/react": "^2.1.5",
     "react": "^18.0.0",
     "react-dom": "^18.0.0",
-    "@dxos/react-ui": "0.6.10-staging.df1ee5d",
-    "@dxos/react-ui-mosaic": "0.6.10-staging.df1ee5d",
-    "@dxos/react-ui-theme": "0.6.10-staging.df1ee5d"
+    "@dxos/react-ui": "0.6.11-staging.a542fc9",
+    "@dxos/react-ui-mosaic": "0.6.11-staging.a542fc9",
+    "@dxos/react-ui-theme": "0.6.11-staging.a542fc9"
   },
   "publishConfig": {
     "access": "public"

package/src/ScriptPlugin.tsx

@@ -107,11 +107,14 @@ export const ScriptPlugin = (): PluginDefinition<ScriptPluginProvides> => {
         creators: [
           {
             id: 'create-stack-section-script',
-            testId: 'scriptPlugin.createSectionSpaceScript',
+            testId: 'scriptPlugin.createSection',
             type: ['plugin name', { ns: SCRIPT_PLUGIN }],
             label: ['create stack section label', { ns: SCRIPT_PLUGIN }],
             icon: (props: any) => <Code {...props} />,
-            intent: { plugin: SCRIPT_PLUGIN, action: ScriptAction.CREATE },
+            intent: {
+              plugin: SCRIPT_PLUGIN,
+              action: ScriptAction.CREATE,
+            },
           },
         ],
       },
@@ -146,8 +149,8 @@ const example = [
   'export default async ({ ',
   '  event: { data: { request } },',
   '  context: { space, ai } ',
-  '}) => {',
-  "  return new Response('Hello World, from ScriptPlugin!');",
+  '}: any) => {',
+  "  return new Response('Hello DXOS!');",
   '};',
   '',
 ].join('\n');

package/src/components/{DetailsPanel.tsx → DebugPanel.tsx}

@@ -3,6 +3,15 @@
 //
 
 import React, { useEffect, useRef, useState } from 'react';
+// @ts-ignore
+// eslint-disable-next-line no-restricted-imports
+import SyntaxHighlighter from 'react-syntax-highlighter';
+// @ts-ignore
+// eslint-disable-next-line no-restricted-imports
+import styleDark from 'react-syntax-highlighter/dist/esm/styles/hljs/a11y-dark';
+// @ts-ignore
+// eslint-disable-next-line no-restricted-imports
+import styleLight from 'react-syntax-highlighter/dist/esm/styles/hljs/a11y-light';
 
 import { log } from '@dxos/log';
 import {
@@ -13,7 +22,7 @@ import {
   type ThemedClassName,
   Toolbar,
   useControlledValue,
-  useDynamicRef,
+  useThemeContext,
   useTranslation,
 } from '@dxos/react-ui';
 import { mx } from '@dxos/react-ui-theme';
@@ -22,15 +31,18 @@ import { SCRIPT_PLUGIN } from '../meta';
 
 type State = 'pending' | 'responding';
 
-type Item = { type: 'request' | 'response'; text: string };
+/**
+ * Request or response.
+ */
+type Message = { type: 'request' | 'response'; text?: string; data?: any; error?: Error };
 
-export type DetailsPanelProps = ThemedClassName<{
+export type DebugPanelProps = ThemedClassName<{
   functionUrl?: string;
   binding?: string;
   onBindingChange?: (binding: string) => void;
 }>;
 
-export const DetailsPanel = ({ classNames, functionUrl, binding: _binding, onBindingChange }: DetailsPanelProps) => {
+export const DebugPanel = ({ classNames, functionUrl, binding: _binding, onBindingChange }: DebugPanelProps) => {
   const { t } = useTranslation(SCRIPT_PLUGIN);
 
   const bindingInputRef = useRef<HTMLInputElement>(null);
@@ -42,11 +54,10 @@ export const DetailsPanel = ({ classNames, functionUrl, binding: _binding, onBin
   const inputRef = useRef<HTMLInputElement>(null);
   const [input, setInput] = useState('');
   const [result, setResult] = useState('');
-  const resultRef = useDynamicRef(result);
   const [state, setState] = useState<State | null>(null);
 
   // TODO(burdon): Persistent history (non-space ECHO data?)
-  const [history, setHistory] = useState<Item[]>([]);
+  const [history, setHistory] = useState<Message[]>([]);
 
   const scrollerRef = useRef<HTMLDivElement>(null);
   const handleScroll = () => {
@@ -67,7 +78,6 @@ export const DetailsPanel = ({ classNames, functionUrl, binding: _binding, onBin
     controller.current = undefined;
   };
 
-  // TODO(burdon): Halt streaming request?
   const handleClear = () => {
     handleStop();
     setInput('');
@@ -76,52 +86,81 @@ export const DetailsPanel = ({ classNames, functionUrl, binding: _binding, onBin
     inputRef.current?.focus();
   };
 
-  const handleDone = () => {
+  const handleResponse = ({ text, data, error }: { text?: string; data?: any; error?: Error } = {}) => {
     controller.current = undefined;
-    setHistory((history) => [...history, { type: 'response', text: resultRef.current }]);
+    setHistory((history) => [...history, { type: 'response', text, data, error } satisfies Message]);
     setResult('');
     setState(null);
     handleScroll();
   };
 
-  const handleRun = async (input: string) => {
-    if (input.trim().length === 0) {
-      inputRef.current?.focus();
-      return;
-    }
-
-    setHistory((history) => [...history, { type: 'request', text: input }]);
-    setInput('');
-    setResult('');
-
+  const handleRequest = async (input: string) => {
     // Returns a promise that resolves when a value has been received.
     try {
       setState('pending');
 
+      let data = null;
+      // Detect JSON input.
+      if (input.charAt(0) === '{') {
+        try {
+          const validJsonString = input.replace(/'/g, '"').replace(/([{,]\s*)([a-zA-Z0-9_]+)(\s*:)/g, '$1"$2"$3');
+          data = JSON.parse(validJsonString);
+          input = JSON.stringify(data, null, 2);
+        } catch (err) {
+          inputRef.current?.focus();
+          return;
+        }
+      }
+
+      setInput('');
+      setResult('');
+      setHistory((history) => [...history, { type: 'request', text: input }]);
+      setTimeout(() => {
+        handleScroll();
+      });
+
       // Throws DOMException when aborted.
       controller.current = new AbortController();
       const response = await fetch(functionUrl!, {
         signal: controller.current.signal,
         method: 'POST',
         body: input,
+        headers: {
+          'Content-Type': data ? 'application/json' : 'text/plain',
+        },
       });
 
-      // TODO(burdon): Error handling.
+      // Check for error.
       if (!response.ok) {
-        setState(null);
+        const text = await response.text();
+        handleResponse({ error: new Error(text || response.statusText || String(response.status)) });
+        return;
+      }
+
+      // Check for JSON.
+      const contentType = response.headers.get('content-type');
+      if (contentType === 'application/json') {
+        const data = await response.json();
+        handleResponse({ data });
         return;
       }
 
+      // Text (including streaming).
       setState('responding');
+      let text = '';
       const reader = response.body!.getReader();
       const pump = async ({ done, value }: ReadableStreamReadResult<Uint8Array>): Promise<void> => {
-        setResult((result) => result + new TextDecoder().decode(value));
-        handleScroll();
+        text = text + new TextDecoder().decode(value);
         if (!controller.current || done) {
-          handleDone();
+          handleResponse({ text });
           return;
         }
 
+        setResult(text);
+        setTimeout(() => {
+          handleScroll();
+        });
+
         return reader.read().then(pump);
       };
 
@@ -133,10 +172,13 @@ export const DetailsPanel = ({ classNames, functionUrl, binding: _binding, onBin
             log.catch(err);
           }
         });
-    } catch (err) {
-      setState(null);
+    } catch (err: any) {
       if (err !== 'stop') {
+        const error = err instanceof Error ? err : new Error(err);
+        handleResponse({ error });
         log.catch(err);
+      } else {
+        handleResponse();
       }
     }
   };
@@ -157,7 +199,7 @@ export const DetailsPanel = ({ classNames, functionUrl, binding: _binding, onBin
               placeholder={t('function request placeholder')}
               value={input}
               onChange={(ev) => setInput(ev.target.value)}
-              onKeyDown={(ev) => ev.key === 'Enter' && handleRun(input)}
+              onKeyDown={(ev) => ev.key === 'Enter' && handleRequest(input)}
             />
           </Input.Root>
           <Input.Root>
@@ -170,7 +212,7 @@ export const DetailsPanel = ({ classNames, functionUrl, binding: _binding, onBin
               onBlur={handleBlur}
             />
           </Input.Root>
-          <Toolbar.Button onClick={() => handleRun(input)}>
+          <Toolbar.Button onClick={() => handleRequest(input)}>
             <Icon icon='ph--play--regular' size={4} />
           </Toolbar.Button>
           <Toolbar.Button onClick={() => (state ? handleStop() : handleClear())}>
@@ -190,17 +232,40 @@ const RobotAvatar = () => (
   </Avatar.Root>
 );
 
-// TODO(burdon): Replace with thread.
-// TODO(burdon): Delete individual messages.
-// TODO(burdon): Re-run question.
-const MessageThread = ({ state, result, history }: { state: State | null; result: string; history: Item[] }) => {
+const MessageItem = ({ classNames, message }: ThemedClassName<{ message: Message }>) => {
+  const { themeMode } = useThemeContext();
+  const { text, data, error } = message;
+  if (error) {
+    return <span className={mx(classNames, 'whitespace-pre text-error')}>{String(error)}</span>;
+  } else if (data) {
+    return (
+      <SyntaxHighlighter
+        language='json'
+        style={themeMode === 'dark' ? styleDark : styleLight}
+        className={mx('w-full text-xs', classNames)}
+      >
+        {JSON.stringify(data, null, 2)}
+      </SyntaxHighlighter>
+    );
+  }
+
+  return <span className={mx(classNames)}>{text || '\u00D8'}</span>;
+};
+
+// TODO(burdon): Replace with thread?
+// TODO(burdon): Button to delete individual messages.
+// TODO(burdon): Button to re-run question.
+const MessageThread = ({ state, result, history }: { state: State | null; result: string; history: Message[] }) => {
   return (
     <>
-      {history.map(({ type, text }, i) => (
+      {history.map((message, i) => (
         <div key={i} className='grid grid-cols-[3rem_1fr]'>
-          <div>{type === 'response' && <RobotAvatar />}</div>
-          <div className={mx('flex', type === 'request' && 'justify-end')}>
-            <span className={mx(type === 'request' && 'p-1 px-2 rounded-lg bg-hoverSurface')}>{text}</span>
+          <div>{message.type === 'response' && <RobotAvatar />}</div>
+          <div className={mx('flex', message.type === 'request' && 'justify-end')}>
+            <MessageItem
+              classNames={[message.type === 'request' && 'p-1 px-2 rounded-lg bg-hoverSurface']}
+              message={message}
+            />
           </div>
         </div>
       ))}

package/src/components/ScriptEditor.tsx

@@ -16,7 +16,7 @@ import { useTranslation } from '@dxos/react-ui';
 import { createDataExtensions, listener } from '@dxos/react-ui-editor';
 import { mx } from '@dxos/react-ui-theme';
 
-import { DetailsPanel } from './DetailsPanel';
+import { DebugPanel } from './DebugPanel';
 import { Toolbar } from './Toolbar';
 import { TypescriptEditor, type TypescriptEditorProps } from './TypescriptEditor';
 import { Bundler } from '../bundler';
@@ -178,7 +178,7 @@ export const ScriptEditor = ({ env, script, role }: ScriptEditorProps) => {
       />
 
       {showPanel && (
-        <DetailsPanel functionUrl={functionUrl} binding={fn?.binding} onBindingChange={handleBindingChange} />
+        <DebugPanel functionUrl={functionUrl} binding={fn?.binding} onBindingChange={handleBindingChange} />
       )}
     </div>
   );

package/src/components/Toolbar.tsx

@@ -2,7 +2,6 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Checks, CircleNotch, Link, MagicWand, UploadSimple, WarningCircle } from '@phosphor-icons/react';
 import React, { useState } from 'react';
 
 import {
@@ -14,7 +13,6 @@ import {
   Tooltip,
   useTranslation,
 } from '@dxos/react-ui';
-import { getSize, mx } from '@dxos/react-ui-theme';
 
 import { SCRIPT_PLUGIN } from '../meta';
 
@@ -64,7 +62,7 @@ export const Toolbar = ({
             <Tooltip.Root>
               <Tooltip.Trigger asChild>
                 <NaturalToolbar.Button variant='ghost' onClick={onFormat}>
-                  <MagicWand className={getSize(4)} />
+                  <Icon icon='ph--magic-want--regular' size={4} />
                 </NaturalToolbar.Button>
               </Tooltip.Trigger>
               <Tooltip.Portal>
@@ -78,27 +76,10 @@ export const Toolbar = ({
 
           <div role='separator' className='grow' />
 
-          {functionUrl && (
-            <Tooltip.Root>
-              <Tooltip.Trigger asChild>
-                <NaturalToolbar.Button variant='ghost' onClick={handleCopyLink}>
-                  <Link className={getSize(4)} />
-                </NaturalToolbar.Button>
-              </Tooltip.Trigger>
-              <Tooltip.Portal>
-                <Tooltip.Content>
-                  <Tooltip.Arrow />
-                  {t('copy link label')}
-                </Tooltip.Content>
-              </Tooltip.Portal>
-            </Tooltip.Root>
-          )}
-
-          {/* TODO(wittjosiah): Better treatment for status indicators in toolbar? */}
           {error ? (
             <Tooltip.Root>
               <Tooltip.Trigger>
-                <WarningCircle className={getSize(4)} />
+                <Icon icon='ph--warning-circle--regular' size={4} />
               </Tooltip.Trigger>
               <Tooltip.Portal>
                 <Tooltip.Content>
@@ -107,27 +88,31 @@ export const Toolbar = ({
                 </Tooltip.Content>
               </Tooltip.Portal>
             </Tooltip.Root>
-          ) : deployed ? (
+          ) : null}
+
+          {functionUrl && deployed && (
             <Tooltip.Root>
-              <Tooltip.Trigger>
-                <Checks className={getSize(4)} />
+              <Tooltip.Trigger asChild>
+                <NaturalToolbar.Button variant='ghost' onClick={handleCopyLink}>
+                  <Icon icon='ph--link--regular' size={4} />
+                </NaturalToolbar.Button>
               </Tooltip.Trigger>
               <Tooltip.Portal>
                 <Tooltip.Content>
                   <Tooltip.Arrow />
-                  {t('deployed label')}
+                  {t('copy link label')}
                 </Tooltip.Content>
               </Tooltip.Portal>
             </Tooltip.Root>
-          ) : null}
+          )}
 
           <Tooltip.Root>
             <Tooltip.Trigger asChild>
               <NaturalToolbar.Button variant='ghost' onClick={handleDeploy} disabled={pending}>
                 {pending ? (
-                  <CircleNotch className={mx('spinner', getSize(4))} />
+                  <Icon icon='ph--spinner--regular' size={4} classNames='animate-spin-slow' />
                 ) : (
-                  <UploadSimple className={getSize(4)} />
+                  <Icon icon='ph--cloud-arrow-up--regular' size={4} />
                 )}
               </NaturalToolbar.Button>
             </Tooltip.Trigger>
@@ -143,7 +128,7 @@ export const Toolbar = ({
             <Tooltip.Root>
               <Tooltip.Trigger asChild>
                 <NaturalToolbar.Button variant='ghost' onClick={onTogglePanel}>
-                  <Icon icon={showPanel ? 'ph--caret-up--regular' : 'ph--caret-down--regular'} size={4} />
+                  <Icon icon={showPanel ? 'ph--caret-down--regular' : 'ph--caret-up--regular'} size={4} />
                 </NaturalToolbar.Button>
               </Tooltip.Trigger>
               <Tooltip.Portal>

package/src/types/script.ts

@@ -5,16 +5,29 @@
 import { ref, S, TypedObject } from '@dxos/echo-schema';
 import { TextType } from '@dxos/plugin-markdown/types';
 
+// TODO(burdon): Which is the outer type? I.e., in the navbar?
+
+/**
+ * Source script.
+ */
 export class ScriptType extends TypedObject({ typename: 'dxos.org/type/Script', version: '0.1.0' })({
+  // TODO(burdon): Change to URI?
   name: S.optional(S.String),
+  description: S.optional(S.String),
   source: ref(TextType),
+  // TODO(burdon): Change to has of deployed content.
   // Whether source has changed since last deploy.
   changed: S.optional(S.Boolean),
 }) {}
 
+/**
+ * Function deployment.
+ */
 export class FunctionType extends TypedObject({ typename: 'dxos.org/type/Function', version: '0.1.0' })({
+  name: S.optional(S.String),
   version: S.Number,
   // Local binding to a function name.
+  // TODO(burdon): Move binding to inner type.
   binding: S.optional(S.String),
   // Reference to a source script if it exists within ECHO.
   source: S.optional(ref(ScriptType)),