@juspay/shooter 1.0.0 → 1.1.0

package/src/lib/modules/server/apn/notification-sessions.ts

@@ -1,18 +1,8 @@
+import type { NotificationSession } from '$generated/types';
+
 import { getNotifications, type NotificationRecord } from './notification-history';
 
-export interface Session {
-  duration: number; // seconds
-  endTime: string;
-  eventCount: number;
-  events: NotificationRecord[];
-  filesModified: string[];
-  id: string;
-  project: string;
-  runtime: string;
-  startTime: string;
-  status: 'active' | 'complete';
-  toolsUsed: string[];
-}
+export type Session = NotificationSession;
 
 const SESSION_GAP_MS = 30 * 60 * 1000; // 30 min gap = new session
 const ACTIVE_THRESHOLD_MS = 5 * 60 * 1000; // active if last event < 5 min ago

package/src/lib/modules/server/apn/pending-requests.ts

@@ -1,14 +1,9 @@
 // Shared in-memory store for pending permission requests.
 // Used by /api/notify (creates entries) and /api/response (reads/updates).
 
-export interface PendingRequest {
-  createdAt: number;
-  decidedAt: null | number;
-  decision: 'allow' | 'deny' | null;
-  sessionId: string;
-  toolInput: Record<string, unknown>;
-  toolName: string;
-}
+import type { PendingRequest } from '$generated/types';
+
+export type { PendingRequest };
 
 const MAX_AGE_MS = 5 * 60 * 1000; // 5 minutes
 

package/src/lib/modules/server/apn/types.ts

@@ -7,12 +7,13 @@ import type {
   SentDetail,
 } from '$generated/types';
 
-// Types not yet generated by type-crafter (contain $ref/arrays/oneOf)
-// TODO: Remove these once type-crafter generates them
+// Composite types built from generated primitives. These use arrays and
+// union constructs that type-crafter does not emit, so they stay as local
+// definitions.
 
 export interface LibraryResult {
-  failed: LibraryFailedItem[] | null;
-  sent: LibrarySentItem[] | null;
+  failed: LibraryFailedItem[];
+  sent: LibrarySentItem[];
 }
 
 export interface NotificationPayload {

package/src/lib/modules/server/cli/index.ts

@@ -6,8 +6,9 @@ export type { ExitCallback, OutputCallback } from './runner';
 // Types generated by type-crafter
 export type { CLIOptions };
 
-// Types not yet generated by type-crafter (contain $ref/arrays)
-// TODO: Remove these once type-crafter generates them
+// Types defined in YAML spec (cli.yaml) but not generated by type-crafter
+// because they contain $ref or array constructs.
+// TODO: Remove once type-crafter supports these constructs.
 export interface CLICommand {
   args: string[];
   name: string;

package/src/lib/modules/server/fcm/fcm-service.ts

@@ -30,15 +30,17 @@ export async function sendFCMNotification(
       },
       data: {
         body: payload.body || payload.message || '',
-        category: payload.category ? String(payload.category) : (payload.data?.category ? String(payload.data.category) : ''),
-        project: payload.data?.project ? String(payload.data.project) : '',
-        requestId: payload.data?.requestId ? String(payload.data.requestId) : '',
-        source: payload.data?.source ? String(payload.data.source) : '',
+        category:
+          payload.category ??
+          (typeof payload.data?.category === 'string' ? payload.data.category : ''),
+        project: typeof payload.data?.project === 'string' ? payload.data.project : '',
+        requestId: typeof payload.data?.requestId === 'string' ? payload.data.requestId : '',
+        source: typeof payload.data?.source === 'string' ? payload.data.source : '',
         timestamp: new Date().toISOString(),
         title: payload.title,
         toolInput: payload.data?.toolInput ? JSON.stringify(payload.data.toolInput) : '',
-        toolName: payload.data?.toolName ? String(payload.data.toolName) : '',
-        type: payload.data?.type ? String(payload.data.type) : '',
+        toolName: typeof payload.data?.toolName === 'string' ? payload.data.toolName : '',
+        type: typeof payload.data?.type === 'string' ? payload.data.type : '',
       },
       token: deviceToken,
     };

package/src/lib/modules/server/sessions/jsonl-parser.ts

@@ -14,12 +14,12 @@ import type { ConversationMessage, MessagePart } from './types';
  * These are control/metadata entries that don't represent conversation content.
  */
 export const SKIP_EVENT_TYPES = new Set([
-  'system',
   'config',
-  'summary',
-  'result',
   'heartbeat',
   'metadata',
+  'result',
+  'summary',
+  'system',
 ]);
 
 /**

package/src/lib/modules/server/sessions/jsonl-reader.ts

@@ -74,8 +74,6 @@ export function listProjectsWithSessions(): ProjectGroup[] {
 
   for (const dir of projectDirs) {
     const projectDir = path.join(CLAUDE_PROJECTS_DIR, dir);
-    // Decode project path (fallback, prefer session's projectPath)
-    const decodedPath = dir.startsWith('-') ? dir.replace(/-/g, '/') : `/${dir.replace(/-/g, '/')}`;
 
     // Get sessions for this project
     const sessions = listSessionsForProject(projectDir);
@@ -86,10 +84,12 @@ export function listProjectsWithSessions(): ProjectGroup[] {
     // Sort sessions by modified desc
     sessions.sort((a, b) => new Date(b.modified).getTime() - new Date(a.modified).getTime());
 
-    // Get real project path from session data instead of decoding directory name
+    // Prefer projectPath from session index, then cwd from JSONL, then decoded dir name
     const realPath =
       sessions.find((s) => s.projectPath && !s.projectPath.includes('.claude/projects'))
-        ?.projectPath || decodedPath;
+        ?.projectPath ||
+      readCwdFromProjectDir(projectDir, sessions) ||
+      (dir.startsWith('-') ? dir.replace(/-/g, '/') : `/${dir.replace(/-/g, '/')}`);
     const pathSegments = realPath.split('/').filter(Boolean);
     const projectName = pathSegments.slice(-2).join('/');
 
@@ -122,7 +122,8 @@ function cleanTitle(prompt: string): string {
     .replace(/<command-args>.*?<\/command-args>/gs, '')
     .replace(/<local-command-caveat>.*?<\/local-command-caveat>/gs, '')
     .replace(/<local-command-stdout>.*?<\/local-command-stdout>/gs, '')
-    .replace(/<system-reminder>.*?<\/system-reminder>/gs, '');
+    .replace(/<system-reminder>.*?<\/system-reminder>/gs, '')
+    .replace(/<task-notification>.*?<\/task-notification>/gs, '');
 
   // Iteratively strip tags until none remain (prevents reconstructed tags like "<scr" + "ipt>")
   let prev = '';
@@ -220,7 +221,9 @@ function listSessionsForProject(projectDir: string): SessionInfo[] {
           // Count user + assistant messages for the message count
           const lines = content.split('\n');
           for (const line of lines) {
-            if (!line.trim()) { continue; }
+            if (!line.trim()) {
+              continue;
+            }
             try {
               const entry = JSON.parse(line);
               if (entry.type === 'user' || entry.type === 'assistant') {
@@ -232,12 +235,18 @@ function listSessionsForProject(projectDir: string): SessionInfo[] {
           }
           // Find the first real user message (skip system caveats, commands, tool results)
           for (const line of lines) {
-            if (!line.trim()) { continue; }
+            if (!line.trim()) {
+              continue;
+            }
             try {
               const entry = JSON.parse(line);
-              if (entry.type !== 'user') { continue; }
+              if (entry.type !== 'user') {
+                continue;
+              }
               const msg = entry.message;
-              if (!msg?.content) { continue; }
+              if (!msg?.content) {
+                continue;
+              }
 
               // Extract text from content (can be string or array of blocks)
               let text = '';
@@ -256,14 +265,22 @@ function listSessionsForProject(projectDir: string): SessionInfo[] {
                 }
               }
 
-              if (!text) { continue; }
+              if (!text) {
+                continue;
+              }
 
               // Skip system-injected caveats and command outputs
-              if (text.startsWith('<local-command') ||
-                  text.startsWith('<command-name>') ||
-                  text.startsWith('<local-command-stdout>') ||
-                  text.startsWith('<system-reminder>') ||
-                  text.startsWith('<task-notification>')) {
+              // Keep aligned with cleanTitle() tag stripping
+              if (
+                text.startsWith('<local-command') ||
+                text.startsWith('<command-name>') ||
+                text.startsWith('<command-message>') ||
+                text.startsWith('<command-args>') ||
+                text.startsWith('<local-command-stdout>') ||
+                text.startsWith('<local-command-caveat>') ||
+                text.startsWith('<system-reminder>') ||
+                text.startsWith('<task-notification>')
+              ) {
                 continue;
               }
 
@@ -299,3 +316,31 @@ function listSessionsForProject(projectDir: string): SessionInfo[] {
     return [];
   }
 }
+
+function readCwdFromProjectDir(projectDir: string, sessions: SessionInfo[]): string {
+  for (const session of sessions) {
+    try {
+      const jsonlPath = path.join(projectDir, `${session.id}.jsonl`);
+      if (!fs.existsSync(jsonlPath)) {
+        continue;
+      }
+      const content = fs.readFileSync(jsonlPath, 'utf-8');
+      for (const line of content.split('\n')) {
+        if (!line.trim()) {
+          continue;
+        }
+        try {
+          const entry = JSON.parse(line) as Record<string, unknown>;
+          if (typeof entry.cwd === 'string' && entry.cwd) {
+            return entry.cwd;
+          }
+        } catch {
+          // skip malformed lines
+        }
+      }
+    } catch {
+      // skip unreadable files
+    }
+  }
+  return '';
+}

package/src/lib/modules/server/sessions/types.ts

@@ -1,33 +1,22 @@
+// Re-export generated types that match 1:1
+export type { MessageRole, ProjectGroup, SessionInfo } from '$generated/types';
+import type { MessageRole } from '$generated/types';
+
+// ── Local interfaces ─────────────────────────────────────────────────
+// These remain local because the generated versions differ structurally:
+// generated MessagePart uses wrapper classes (CMessagePartTextPart, etc.)
+// and part types use `type: string` instead of string literals needed
+// for discriminated unions. Declared as interfaces per ESLint rules.
+
 export interface ConversationMessage {
   id: string;
   parts: MessagePart[];
-  role: 'assistant' | 'system' | 'user';
+  role: MessageRole;
   timestamp: string;
 }
 
 export type MessagePart = TextPart | ThinkingPart | ToolResultPart | ToolUsePart;
 
-export interface ProjectGroup {
-  fullPath: string;
-  id: string;
-  lastModified: string;
-  name: string;
-  sessionCount: number;
-  sessions: SessionInfo[];
-}
-
-export interface SessionInfo {
-  created: string;
-  gitBranch: string;
-  id: string;
-  messageCount: number;
-  modified: string;
-  projectPath: string;
-  source: 'claude-code' | 'opencode';
-  summary: string;
-  title: string;
-}
-
 export interface TextPart {
   content: string;
   type: 'text';