termcast 1.3.25 → 1.3.27

package/src/examples/nested-navigation.tsx

@@ -1,10 +1,7 @@
 import React from 'react'
-import { createRoot } from '@opentui/react'
-import { createCliRenderer } from '@opentui/core'
-import List from 'termcast'
+import List, { renderWithProviders } from 'termcast'
 import { Action, ActionPanel } from 'termcast'
 import { useNavigation } from 'termcast/src/internal/navigation'
-import { TermcastProvider } from 'termcast/src/internal/providers'
 
 function ThirdLevel({ path }: { path: string[] }): any {
   const { pop } = useNavigation()
@@ -108,13 +105,4 @@ function FirstLevel(): any {
   )
 }
 
-function App(): any {
-  return (
-    <TermcastProvider>
-      <FirstLevel />
-    </TermcastProvider>
-  )
-}
-
-const renderer = await createCliRenderer()
-createRoot(renderer).render(<App />)
+await renderWithProviders(<FirstLevel />)

package/src/examples/simple-navigation.tsx

@@ -1,10 +1,7 @@
 import React from 'react'
-import { createRoot } from '@opentui/react'
-import { createCliRenderer } from '@opentui/core'
-import List from 'termcast'
+import List, { renderWithProviders } from 'termcast'
 import { Action, ActionPanel } from 'termcast'
 import { useNavigation } from 'termcast/src/internal/navigation'
-import { TermcastProvider } from 'termcast/src/internal/providers'
 
 function GoBackAction(): any {
   const { pop } = useNavigation()
@@ -87,13 +84,4 @@ function MainView(): any {
   )
 }
 
-function App(): any {
-  return (
-    <TermcastProvider>
-      <MainView />
-    </TermcastProvider>
-  )
-}
-
-const renderer = await createCliRenderer()
-createRoot(renderer).render(<App />)
+await renderWithProviders(<MainView />)

package/src/extensions/dev.tsx

@@ -9,7 +9,7 @@ import { useNavigation } from 'termcast/src/internal/navigation'
 import { TermcastProvider } from 'termcast/src/internal/providers'
 import { showToast, Toast } from 'termcast/src/apis/toast'
 import { Icon } from 'termcast'
-import { getCommandsWithFiles, CommandWithFile } from '../package-json'
+import { getCommandsWithFiles, CommandWithFile, RaycastPackageJson } from '../package-json'
 import { buildExtensionCommands } from '../build'
 import {
   runCommand,
@@ -24,18 +24,15 @@ interface BundledCommand extends CommandWithFile {
 }
 
 function ExtensionCommandsList({
-  extensionPath,
+  packageJson,
   commands,
   skipArgv,
 }: {
-  extensionPath: string
+  packageJson: RaycastPackageJson
   commands: BundledCommand[]
   skipArgv?: number
 }): any {
   const { push } = useNavigation()
-  const { packageJson } = getCommandsWithFiles({
-    packageJsonPath: path.join(extensionPath, 'package.json'),
-  })
 
   const visibleCommands = commands.filter((cmd) => cmd.mode !== 'menu-bar')
 
@@ -205,7 +202,7 @@ export async function startDevMode({
     extensionPath: resolvedPath,
     extensionPackageJson: packageJson,
     devElement: (
-      <ExtensionCommandsList extensionPath={resolvedPath} commands={commands} skipArgv={skipArgv} />
+      <ExtensionCommandsList packageJson={packageJson} commands={commands} skipArgv={skipArgv} />
     ),
     devRebuildCount: 1,
   })
@@ -217,32 +214,39 @@ export async function startDevMode({
     return <TermcastProvider key={String(devRebuildCount)}>{devElement}</TermcastProvider>
   }
 
-  const renderer = await createCliRenderer()
+  const renderer = await createCliRenderer({
+    onDestroy: () => {
+      process.exit(0)
+    },
+  })
   createRoot(renderer).render(<App />)
 }
 
 export async function startCompiledExtension({
-  extensionPath,
+  packageJson,
   compiledCommands,
   skipArgv = 0,
 }: {
-  extensionPath: string
+  packageJson: RaycastPackageJson
   compiledCommands: Array<{
     name: string
-    bundledPath: string
     Component: (props: any) => any
   }>
   skipArgv?: number
 }): Promise<void> {
-  const packageJsonPath = path.join(extensionPath, 'package.json')
-  const { packageJson, commands: commandsMetadata } = getCommandsWithFiles({
-    packageJsonPath,
-  })
+  // Build command metadata from packageJson.commands
+  const commandsMetadata = (packageJson.commands || []).map((cmd) => ({
+    ...cmd,
+    filePath: '',
+    exists: true,
+  }))
 
   const commands: BundledCommand[] = compiledCommands.map((compiled) => {
     const metadata = commandsMetadata.find((cmd) => cmd.name === compiled.name)
     return {
       ...metadata!,
+      filePath: '',
+      exists: true,
       bundledPath: '',
       Component: compiled.Component,
     }
@@ -261,10 +265,10 @@ export async function startCompiledExtension({
 
   useStore.setState({
     ...useStore.getInitialState(),
-    extensionPath,
+    extensionPath: '', // No filesystem path for compiled extensions
     extensionPackageJson: packageJson,
     devElement: (
-      <ExtensionCommandsList extensionPath={extensionPath} commands={commands} skipArgv={skipArgv} />
+      <ExtensionCommandsList packageJson={packageJson} commands={commands} skipArgv={skipArgv} />
     ),
     devRebuildCount: 1,
   })
@@ -274,7 +278,11 @@ export async function startCompiledExtension({
     return <TermcastProvider>{devElement}</TermcastProvider>
   }
 
-  const renderer = await createCliRenderer()
+  const renderer = await createCliRenderer({
+    onDestroy: () => {
+      process.exit(0)
+    },
+  })
   createRoot(renderer).render(<App />)
 }
 
@@ -301,7 +309,7 @@ export async function triggerRebuild({
       extensionPackageJson: packageJson,
       devElement: (
         <ExtensionCommandsList
-          extensionPath={extensionPath}
+          packageJson={packageJson}
           commands={commands}
         />
       ),

package/src/extensions/home.tsx

@@ -1,12 +1,9 @@
 import fs from 'node:fs'
 import path from 'node:path'
 import React from 'react'
-import { createRoot } from '@opentui/react'
-import { createCliRenderer } from '@opentui/core'
-import { List, logger, useStore } from 'termcast'
+import { List, logger, useStore, renderWithProviders } from 'termcast'
 import { Action, ActionPanel } from 'termcast'
 import { useNavigation } from 'termcast/src/internal/navigation'
-import { TermcastProvider } from 'termcast/src/internal/providers'
 import { showToast, Toast } from 'termcast/src/apis/toast'
 import { Icon } from 'termcast'
 import { getStoredExtensions } from '../utils'
@@ -185,13 +182,7 @@ function ExtensionsList({
 
 export async function runHomeCommand(): Promise<void> {
   logger.log(`preparing to render the home command component`)
-
-  const renderer = await createCliRenderer()
-  createRoot(renderer).render(
-    <TermcastProvider>
-      <Home />
-    </TermcastProvider>,
-  )
+  await renderWithProviders(<Home />)
   logger.log(`rendered home command component`)
 }
 

package/src/internal/navigation.tsx

@@ -8,7 +8,7 @@ import React, {
   startTransition,
   useTransition,
 } from 'react'
-import { useKeyboard } from '@opentui/react'
+import { useKeyboard, useRenderer } from '@opentui/react'
 import { CommonProps } from 'termcast/src/utils'
 import { useStore, type NavigationStackItem } from 'termcast/src/state'
 import { useIsInFocus } from 'termcast/src/internal/focus-context'
@@ -117,18 +117,24 @@ export function NavigationProvider(props: NavigationProviderProps): any {
   )
 
   const inFocus = useIsInFocus()
+  const renderer = useRenderer()
 
-  // Handle ESC key to pop navigation
+  // Handle ESC key to pop navigation or exit
   useKeyboard((evt) => {
     if (!inFocus) return
-    if (evt.name === 'escape' && stack.length > 1) {
-      logger.log(
-        'popping navigation',
-        stack.length - 1,
-        'stack:',
-        stack.map((item) => (item.element as any).type.name),
-      )
-      pop()
+    if (evt.name === 'escape') {
+      if (stack.length > 1) {
+        logger.log(
+          'popping navigation',
+          stack.length - 1,
+          'stack:',
+          stack.map((item) => (item.element as any).type.name),
+        )
+        pop()
+      } else {
+        // At root with no dialogs - exit the CLI
+        renderer.destroy()
+      }
     }
   })
 

package/src/utils.tsx

@@ -14,7 +14,11 @@ import {
 import { logger } from './logger'
 
 export async function renderWithProviders(element: ReactNode): Promise<void> {
-  const renderer = await createCliRenderer()
+  const renderer = await createCliRenderer({
+    onDestroy: () => {
+      process.exit(0)
+    },
+  })
   createRoot(renderer).render(<TermcastProvider>{element}</TermcastProvider>)
 }