@juspay/shooter 1.0.0 → 1.1.0

package/src/generated/types/index.ts

@@ -1,6 +1,12 @@
+export * from './JWT';
 export * from './APN';
-export * from './Apn';
 export * from './CLI';
-export * from './Cli';
-export * from './JWT';
 export * from './Terminal';
+export * from './Sessions';
+export * from './API';
+export * from './WsProtocol';
+export * from './Holder';
+export * from './OpenCode';
+export * from './Notification';
+export * from './Client';
+export * from './Config';

package/src/lib/env.ts

@@ -0,0 +1,29 @@
+// Side-effect module: loads .env before any other imports.
+// Must be imported first in server.ts.
+//
+// Resolution order:
+// 1. $SHOOTER_HOME/.env  (if SHOOTER_HOME is set and file exists)
+// 2. .env in cwd         (dotenv default)
+// 3. ~/.shooter/.env     (final fallback — setup.cjs writes here)
+import { config } from 'dotenv';
+import { existsSync } from 'fs';
+import { homedir } from 'os';
+import { join } from 'path';
+
+const shooterHome = process.env.SHOOTER_HOME || '';
+const envPath = shooterHome ? join(shooterHome, '.env') : undefined;
+
+if (envPath && existsSync(envPath)) {
+  // 1. SHOOTER_HOME/.env
+  config({ path: envPath });
+} else {
+  // 2. .env in cwd (dotenv default — only populates vars not already set)
+  config();
+
+  // 3. ~/.shooter/.env as final fallback
+  const fallbackPath = join(homedir(), '.shooter', '.env');
+  if (existsSync(fallbackPath)) {
+    // override: false ensures cwd .env values take precedence
+    config({ override: false, path: fallbackPath });
+  }
+}

package/src/lib/modules/client/common/config-guard.ts

@@ -1,10 +1,11 @@
 /**
  * Type guard for ShooterConfig objects stored in localStorage.
  *
- * The stricter variant (used on the config page) validates that apiKey
- * and deviceToken are strings. The simpler variant only checks key
- * presence. This implementation uses the stricter check so all
- * consumers benefit from the extra safety.
+ * Validates that the required apiKey field is a non-empty string.
+ * All other fields (deviceToken, serverUrl, lastUpdated) are nullable
+ * in the generated ShooterConfig type, so any parsed object with a
+ * valid apiKey is treated as a full ShooterConfig (missing nullable
+ * fields default to null at runtime).
  */
 
 import type { ShooterConfig } from '$lib/types/config';
@@ -14,5 +15,36 @@ export function isShooterConfig(value: unknown): value is ShooterConfig {
     return false;
   }
   const obj = value as Record<string, unknown>;
-  return typeof obj.apiKey === 'string' && typeof obj.deviceToken === 'string';
+  if (typeof obj.apiKey !== 'string' || obj.apiKey.length === 0) {
+    return false;
+  }
+  // Validate nullable fields are string | null | undefined (reject numbers, booleans, etc.)
+  if (
+    obj.deviceToken !== undefined &&
+    obj.deviceToken !== null &&
+    typeof obj.deviceToken !== 'string'
+  ) {
+    return false;
+  }
+  if (obj.serverUrl !== undefined && obj.serverUrl !== null && typeof obj.serverUrl !== 'string') {
+    return false;
+  }
+  if (
+    obj.lastUpdated !== undefined &&
+    obj.lastUpdated !== null &&
+    typeof obj.lastUpdated !== 'string'
+  ) {
+    return false;
+  }
+  // Normalize nullable fields so the value satisfies ShooterConfig at runtime
+  if (obj.deviceToken === undefined) {
+    obj.deviceToken = null;
+  }
+  if (obj.serverUrl === undefined) {
+    obj.serverUrl = null;
+  }
+  if (obj.lastUpdated === undefined) {
+    obj.lastUpdated = null;
+  }
+  return true;
 }

package/src/lib/modules/client/common/error.ts

@@ -0,0 +1,10 @@
+/** Extract a human-readable message from an unknown thrown value. */
+export function toErrorMessage(err: unknown): string {
+  if (err instanceof Error) {
+    return err.message;
+  }
+  if (typeof err === 'string') {
+    return err;
+  }
+  return String(err);
+}

package/src/lib/modules/client/common/index.ts

@@ -1,12 +1,13 @@
-export { default as Card } from './Card.svelte';
-export { default as EmptyState } from './EmptyState.svelte';
-export { default as Icon } from './Icon.svelte';
-export { default as StatusBadge } from './StatusBadge.svelte';
-
 // Shared client utilities
 export { getCached, setCache } from './cache';
+export { default as Card } from './Card.svelte';
 export { isShooterConfig } from './config-guard';
+export { default as EmptyState } from './EmptyState.svelte';
+export { toErrorMessage } from './error';
+
+export { default as Icon } from './Icon.svelte';
 export { renderMarkdown } from './markdown';
 export { hasScanner, isNativeBridge, scanQR } from './native-bridge';
+export { default as StatusBadge } from './StatusBadge.svelte';
 export { formatRelativeTime } from './time';
 export { getToolDescription } from './tool-title';

package/src/lib/modules/client/common/native-bridge.ts

@@ -8,34 +8,23 @@
  * resolving scanner/picker promises using its own callback registry.
  */
 
+/** True when the native bridge exposes a QR scanner */
+export function hasScanner(): boolean {
+  return getScanFn() !== null;
+}
+
 /** True when the page is running inside a native WebView with a bridge */
 export function isNativeBridge(): boolean {
-  if (typeof window === 'undefined') return false;
+  if (typeof window === 'undefined') {
+    return false;
+  }
   // iOS injects window.ShooterBridge, Android injects window.ShooterNativeBridge
   return (
     (typeof window.ShooterBridge === 'object' && window.ShooterBridge !== null) ||
-    (typeof (window as any).ShooterNativeBridge === 'object' && (window as any).ShooterNativeBridge !== null)
+    (typeof window.ShooterNativeBridge === 'object' && window.ShooterNativeBridge !== null)
   );
 }
 
-/** Get the scanner.scan function from whichever bridge exists */
-function getScanFn(): (() => Promise<string>) | null {
-  if (typeof window === 'undefined') return null;
-  // Check iOS bridge first, then Android
-  if (typeof window.ShooterBridge?.scanner?.scan === 'function') {
-    return () => window.ShooterBridge!.scanner!.scan();
-  }
-  if (typeof (window as any).ShooterNativeBridge?.scanner?.scan === 'function') {
-    return () => (window as any).ShooterNativeBridge.scanner.scan();
-  }
-  return null;
-}
-
-/** True when the native bridge exposes a QR scanner */
-export function hasScanner(): boolean {
-  return getScanFn() !== null;
-}
-
 /**
  * Invoke the native QR scanner.
  * Returns the scanned string on success, throws on cancel/error.
@@ -48,3 +37,22 @@ export async function scanQR(): Promise<string> {
   }
   return scan();
 }
+
+/** Get the scanner.scan function from whichever bridge exists */
+function getScanFn(): (() => Promise<string>) | null {
+  if (typeof window === 'undefined') {
+    return null;
+  }
+  // Check iOS bridge first, then Android.
+  // Capture the scanner object (not the bare function) to preserve `this` binding
+  // when the native side implements scan() as a method on the scanner object.
+  const iosScanner = window.ShooterBridge?.scanner;
+  if (iosScanner && typeof iosScanner.scan === 'function') {
+    return () => iosScanner.scan();
+  }
+  const androidScanner = window.ShooterNativeBridge?.scanner;
+  if (androidScanner && typeof androidScanner.scan === 'function') {
+    return () => androidScanner.scan();
+  }
+  return null;
+}

package/src/lib/modules/client/terminal/ChatView.svelte

@@ -5,11 +5,8 @@
     ToolUsePart,
   } from '$lib/modules/server/sessions/types';
 
+  import { getToolDescription, renderMarkdown } from '$lib/modules/client/common';
   import { Accordion, Avatar, Button, Input, Pill } from '@juspay/svelte-ui-components';
-  import {
-    getToolDescription,
-    renderMarkdown,
-  } from '$lib/modules/client/common';
   import { tick } from 'svelte';
   import { SvelteSet } from 'svelte/reactivity';
 
@@ -48,13 +45,17 @@
   });
 
   async function scrollToBottom(): Promise<void> {
-    if (!shouldAutoScroll || !chatContainerEl) { return; }
+    if (!shouldAutoScroll || !chatContainerEl) {
+      return;
+    }
     await tick();
     chatContainerEl.scrollTop = chatContainerEl.scrollHeight;
   }
 
   function handleScroll(): void {
-    if (!chatContainerEl) { return; }
+    if (!chatContainerEl) {
+      return;
+    }
     const { clientHeight, scrollHeight, scrollTop } = chatContainerEl;
     shouldAutoScroll = scrollHeight - scrollTop - clientHeight < 100;
   }
@@ -62,7 +63,9 @@
   // --- Input handling ---
   function handleSend(): void {
     const text = inputText.trim();
-    if (!text) { return; }
+    if (!text) {
+      return;
+    }
     inputText = '';
     onSendInput?.(text);
   }
@@ -109,9 +112,7 @@
         <span class="chatview-title">Session</span>
       </div>
       <div class="chatview-header-right">
-        <span
-          class="connection-status {connectionState}"
-        >
+        <span class="connection-status {connectionState}">
           <span class="connection-status-dot"></span>
           {connectionState === 'connected'
             ? 'Connected'
@@ -120,18 +121,20 @@
               : 'Disconnected'}
         </span>
         {#if !sessionEnded && onCancel}
-          <Button classes="btn-danger btn-sm" onclick={() => { onCancel(); }} text="Cancel" />
+          <Button
+            classes="btn-danger btn-sm"
+            onclick={() => {
+              onCancel();
+            }}
+            text="Cancel"
+          />
         {/if}
       </div>
     </div>
   {/if}
 
   <!-- Chat Container (scrollable) -->
-  <div
-    class="chat-container chatview-scroll"
-    bind:this={chatContainerEl}
-    onscroll={handleScroll}
-  >
+  <div class="chat-container chatview-scroll" bind:this={chatContainerEl} onscroll={handleScroll}>
     {#if messages.length === 0}
       <div class="chatview-empty">
         <p class="chatview-empty-text">Waiting for session messages...</p>
@@ -144,6 +147,7 @@
               {#each message.parts as part, partIdx (partIdx)}
                 {#if part.type === 'text'}
                   <div class="chat-bubble chat-bubble-user">
+                    <!-- eslint-disable-next-line svelte/no-at-html-tags -- sanitized markdown -->
                     {@html renderMarkdown(part.content)}
                   </div>
                 {/if}
@@ -159,6 +163,7 @@
               {#each message.parts as part, partIdx (partIdx)}
                 {#if part.type === 'text'}
                   <div class="chat-bubble chat-bubble-assistant">
+                    <!-- eslint-disable-next-line svelte/no-at-html-tags -- sanitized markdown -->
                     {@html renderMarkdown(part.content)}
                   </div>
                 {:else if isToolUsePart(part)}
@@ -167,9 +172,14 @@
                   <div class="chat-tool-card">
                     <div
                       class="chat-tool-header"
-                      onclick={() => { toggleTool(toolId); }}
+                      onclick={() => {
+                        toggleTool(toolId);
+                      }}
                       onkeydown={(e) => {
-                        if (e.key === 'Enter' || e.key === ' ') { toggleTool(toolId); }
+                        if (e.key === 'Enter' || e.key === ' ') {
+                          e.preventDefault();
+                          toggleTool(toolId);
+                        }
                       }}
                       role="button"
                       tabindex="0"
@@ -190,9 +200,14 @@
                   <div class="chat-thinking">
                     <div
                       class="chat-thinking-header"
-                      onclick={() => { toggleTool(thinkId); }}
+                      onclick={() => {
+                        toggleTool(thinkId);
+                      }}
                       onkeydown={(e) => {
-                        if (e.key === 'Enter' || e.key === ' ') { toggleTool(thinkId); }
+                        if (e.key === 'Enter' || e.key === ' ') {
+                          e.preventDefault();
+                          toggleTool(thinkId);
+                        }
                       }}
                       role="button"
                       tabindex="0"
@@ -201,6 +216,7 @@
                     </div>
                     <Accordion expand={isThinkExpanded}>
                       {#if isThinkExpanded}
+                        <!-- eslint-disable-next-line svelte/no-at-html-tags -- sanitized markdown -->
                         <div class="chat-thinking-body">{@html renderMarkdown(part.content)}</div>
                       {/if}
                     </Accordion>
@@ -219,9 +235,14 @@
                 <div class="chat-tool-card">
                   <div
                     class="chat-tool-header"
-                    onclick={() => { toggleTool(resultId); }}
+                    onclick={() => {
+                      toggleTool(resultId);
+                    }}
                     onkeydown={(e) => {
-                      if (e.key === 'Enter' || e.key === ' ') { toggleTool(resultId); }
+                      if (e.key === 'Enter' || e.key === ' ') {
+                        e.preventDefault();
+                        toggleTool(resultId);
+                      }
                     }}
                     role="button"
                     tabindex="0"
@@ -249,6 +270,7 @@
               <!-- System text messages (e.g. error messages displayed inline) -->
               <div class="chat-message chat-message-system">
                 <div class="chat-bubble chat-bubble-system">
+                  <!-- eslint-disable-next-line svelte/no-at-html-tags -- sanitized markdown -->
                   {@html renderMarkdown(part.content)}
                 </div>
               </div>
@@ -273,7 +295,8 @@
       <Input
         bind:value={inputText}
         dataType="text"
-        placeholder={sessionEnded ? 'Session ended' : 'Send a message...'}
+        useTextArea={true}
+        placeholder={sessionEnded ? 'Session ended' : 'Send a message... (Shift+Enter for new line)'}
         disable={sessionEnded || connectionState !== 'connected'}
         onKeyDown={handleKeydown}
         classes="chat-input-field"

package/src/lib/modules/client/terminal/CommandPalette.svelte

@@ -9,10 +9,11 @@
   interface Props {
     commands: Command[];
     onClose: () => void;
-    open: boolean;
+    open?: boolean;
   }
 
-  let { commands, onClose, open = $bindable() }: Props = $props();
+  // eslint-disable-next-line prefer-const -- open is mutated via bind:open from parent
+  let { commands, onClose, open = $bindable(false) }: Props = $props();
 
   const items = $derived(
     commands.map((cmd, i) => ({

package/src/lib/modules/client/terminal/ConnectionStatus.svelte

@@ -17,7 +17,12 @@
   );
 </script>
 
-<div class="connection-status" class:reconnecting={status === 'reconnecting'} class:disconnected={status === 'disconnected'} class:connected={status === 'connected'}>
+<div
+  class="connection-status"
+  class:reconnecting={status === 'reconnecting'}
+  class:disconnected={status === 'disconnected'}
+  class:connected={status === 'connected'}
+>
   <span class="status-dot {status}"></span>
   <span class="status-label">{label}</span>
   {#if status === 'disconnected' && onretry}