@juspay/shooter 1.15.0 → 1.17.0

package/src/lib/modules/server/ws/session-handler.ts

@@ -22,6 +22,8 @@ import type { WebSocket } from 'ws';
 import * as fs from 'fs';
 import * as path from 'path';
 
+import { findCodexRolloutById } from '../sessions/codex-reader';
+
 // ── Module-level references ──────────────────────────────────────────
 
 let _ptyManager: null | PtyManagerLike = null;
@@ -171,34 +173,36 @@ function conversationToLive(msg: ConversationMessage): ServerMessage[] {
  * Returns the absolute path if found, or null.
  */
 function findJsonlFileForSession(sessionId: string): null | string {
-  const claudeProjectsDir = path.join(process.env.HOME || '', '.claude', 'projects');
-
-  if (!fs.existsSync(claudeProjectsDir)) {
+  // Reject anything that could traverse out of the session directories before
+  // it is interpolated into a filesystem path.
+  if (!/^[A-Za-z0-9_-]+$/.test(sessionId)) {
     return null;
   }
 
-  try {
-    const projectDirs = fs.readdirSync(claudeProjectsDir);
-    for (const dir of projectDirs) {
-      const fullDir = path.join(claudeProjectsDir, dir);
-      try {
-        if (!fs.statSync(fullDir).isDirectory()) {
+  const claudeProjectsDir = path.join(process.env.HOME || '', '.claude', 'projects');
+  if (fs.existsSync(claudeProjectsDir)) {
+    try {
+      for (const dir of fs.readdirSync(claudeProjectsDir)) {
+        const fullDir = path.join(claudeProjectsDir, dir);
+        try {
+          if (!fs.statSync(fullDir).isDirectory()) {
+            continue;
+          }
+        } catch {
           continue;
         }
-      } catch {
-        continue;
-      }
-
-      const jsonlPath = path.join(fullDir, `${sessionId}.jsonl`);
-      if (fs.existsSync(jsonlPath)) {
-        return jsonlPath;
+        const jsonlPath = path.join(fullDir, `${sessionId}.jsonl`);
+        if (fs.existsSync(jsonlPath)) {
+          return jsonlPath;
+        }
       }
+    } catch {
+      // Ignore filesystem errors
     }
-  } catch {
-    // Ignore filesystem errors
   }
 
-  return null;
+  // Fall back to an external Codex session: ~/.codex/sessions/**/rollout-*-<id>.jsonl
+  return findCodexRolloutById(sessionId);
 }
 
 // ── Helpers ──────────────────────────────────────────────────────────

package/src/lib/theme.css

@@ -486,7 +486,7 @@
   --pill-cursor: inherit;
 }
 
-.pill-source-claude {
+.pill-source-claude-code {
   --pill-background: var(--ds-blue-100);
   --pill-color: var(--ds-blue-900);
   --pill-font-size: 10px;
@@ -506,6 +506,59 @@
   --pill-cursor: inherit;
 }
 
+.pill-source-codex {
+  --pill-background: var(--ds-green-100);
+  --pill-color: var(--ds-green-900);
+  --pill-font-size: 10px;
+  --pill-padding: 2px 8px;
+  --pill-hover-background: var(--ds-green-100);
+  --pill-hover-color: var(--ds-green-900);
+  --pill-cursor: inherit;
+}
+
+.pill-source-gemini {
+  --pill-background: var(--ds-gray-100);
+  --pill-color: var(--ds-gray-900);
+  --pill-font-size: 10px;
+  --pill-padding: 2px 8px;
+  --pill-hover-background: var(--ds-gray-100);
+  --pill-hover-color: var(--ds-gray-900);
+  --pill-cursor: inherit;
+}
+
+/* Additional providers reuse the existing colour families (cosmetic only). */
+.pill-source-qwen,
+.pill-source-iflow {
+  --pill-background: var(--ds-red-100);
+  --pill-color: var(--ds-red-900);
+  --pill-font-size: 10px;
+  --pill-padding: 2px 8px;
+  --pill-hover-background: var(--ds-red-100);
+  --pill-hover-color: var(--ds-red-900);
+  --pill-cursor: inherit;
+}
+
+.pill-source-cursor {
+  --pill-background: var(--ds-blue-100);
+  --pill-color: var(--ds-blue-900);
+  --pill-font-size: 10px;
+  --pill-padding: 2px 8px;
+  --pill-hover-background: var(--ds-blue-100);
+  --pill-hover-color: var(--ds-blue-900);
+  --pill-cursor: inherit;
+}
+
+.pill-source-copilot,
+.pill-source-amp {
+  --pill-background: var(--ds-amber-100);
+  --pill-color: var(--ds-amber-900);
+  --pill-font-size: 10px;
+  --pill-padding: 2px 8px;
+  --pill-hover-background: var(--ds-amber-100);
+  --pill-hover-color: var(--ds-amber-900);
+  --pill-cursor: inherit;
+}
+
 /* ===== Icon Sizes ===== */
 .icon-14 {
   --icon-width: 14px;

package/src/lib/types/codex.ts

@@ -0,0 +1,21 @@
+// Codex CLI session types (hand-written: the rollout record shapes are
+// provider-specific and not worth round-tripping through the YAML codegen).
+// Codex stores sessions as JSONL "rollout" files under
+// ~/.codex/sessions/YYYY/MM/DD/rollout-<ts>-<uuid>.jsonl.
+
+import type { ConversationMessage } from './sessions';
+
+/** Result of parsing a Codex rollout file into the canonical message model. */
+export interface CodexParseResult {
+  messages: ConversationMessage[];
+  meta: CodexSessionMeta | null;
+}
+
+/** First-line `session_meta` payload of a Codex rollout file. */
+export interface CodexSessionMeta {
+  cliVersion: string;
+  cwd: string;
+  id: string;
+  model: string;
+  startedAt: string;
+}

package/src/lib/types/gemini.ts

@@ -0,0 +1,100 @@
+// Gemini CLI session types (hand-written: the on-disk formats are
+// provider-specific and not worth round-tripping through the YAML codegen).
+// Gemini CLI stores user messages in ~/.gemini/tmp/<projectHash>/logs.json
+// and full conversation records in
+// ~/.gemini/tmp/<projectHash>/chats/session-*.json (newer versions only).
+
+// ---------------------------------------------------------------------------
+// logs.json — user-messages-only format (all versions)
+// ---------------------------------------------------------------------------
+
+/** Union of all part shapes that appear in a ConversationRecord message. */
+export type GeminiContentPart = GeminiFunctionCallPart | GeminiTextPart | GeminiThoughtPart;
+
+// ---------------------------------------------------------------------------
+// chats/session-*.json — full ConversationRecord (newer versions)
+// ---------------------------------------------------------------------------
+
+/** Full conversation record stored in chats/session-*.json. */
+export interface GeminiConversationRecord {
+  directories?: string[];
+  kind?: 'main' | 'subagent';
+  lastUpdated: string;
+  messages: GeminiMessageRecord[];
+  projectHash: string;
+  sessionId: string;
+  startTime: string;
+  summary?: string;
+}
+
+/** Inline function-call part from the Google GenAI SDK. */
+export interface GeminiFunctionCallPart {
+  functionCall: {
+    args: Record<string, unknown>;
+    id?: string;
+    name: string;
+  };
+}
+
+/** A single entry in ~/.gemini/tmp/<projectHash>/logs.json. */
+export interface GeminiLogEntry {
+  message: string;
+  messageId: number;
+  sessionId: string;
+  timestamp: string;
+  type: 'user';
+}
+
+/** A single message record in a full ConversationRecord. */
+export type GeminiMessageRecord =
+  | {
+      content: GeminiContentPart[] | string;
+      id: string;
+      thoughts?: GeminiThoughtSummary[];
+      timestamp: string;
+      toolCalls?: GeminiToolCallRecord[];
+      type: 'gemini';
+    }
+  | {
+      content: GeminiContentPart[] | string;
+      id: string;
+      timestamp: string;
+      type: 'error' | 'info' | 'user' | 'warning';
+    };
+
+/** Contents of ~/.gemini/projects.json (present only in newer gemini-cli). */
+export type GeminiProjectsJson = Record<string, string>;
+
+/** Plain-text content part from the Google GenAI SDK. */
+export interface GeminiTextPart {
+  text: string;
+  thought?: false;
+}
+
+/** Inline thinking/reasoning part from the Google GenAI SDK. */
+export interface GeminiThoughtPart {
+  text: string;
+  thought: true;
+}
+
+/** A thought-summary entry attached to a 'gemini'-type message. */
+export interface GeminiThoughtSummary {
+  summary?: string;
+  timestamp: string;
+}
+
+// ---------------------------------------------------------------------------
+// projects.json — project slug → absolute path registry (newer versions)
+// ---------------------------------------------------------------------------
+
+/** A single tool-call record attached to a 'gemini'-type message. */
+export interface GeminiToolCallRecord {
+  args: Record<string, unknown>;
+  description?: string;
+  displayName?: string;
+  id: string;
+  name: string;
+  result?: unknown;
+  status: 'cancelled' | 'error' | 'pending' | 'success';
+  timestamp: string;
+}

package/src/lib/types/generated/Sessions.ts

@@ -14,12 +14,28 @@ import {
  * @type { SessionSource }
  * @description Source tool that produced the session
  */
-export type SessionSource = 'claude-code' | 'opencode';
+export type SessionSource =
+  | 'claude-code'
+  | 'opencode'
+  | 'codex'
+  | 'gemini'
+  | 'qwen'
+  | 'cursor'
+  | 'copilot'
+  | 'amp'
+  | 'iflow';
 
 export function decodeSessionSource(rawInput: unknown): SessionSource | null {
   switch (rawInput) {
     case 'claude-code':
     case 'opencode':
+    case 'codex':
+    case 'gemini':
+    case 'qwen':
+    case 'cursor':
+    case 'copilot':
+    case 'amp':
+    case 'iflow':
       return rawInput;
   }
   return null;
@@ -29,6 +45,13 @@ export function _decodeSessionSource(rawInput: unknown): SessionSource | undefin
   switch (rawInput) {
     case 'claude-code':
     case 'opencode':
+    case 'codex':
+    case 'gemini':
+    case 'qwen':
+    case 'cursor':
+    case 'copilot':
+    case 'amp':
+    case 'iflow':
       return rawInput;
   }
   return;

package/src/lib/types/index.ts

@@ -4,9 +4,11 @@
 export type * from './activity';
 export type * from './apn';
 export type * from './cli';
+export type * from './codex';
 export type * from './common';
 export type * from './dashboard';
 export * from './decision';
+export type * from './gemini';
 export * from './generated';
 export type * from './neurolink';
 export type * from './server';

package/src/lib/types/server.ts

@@ -8,11 +8,22 @@
 import type { FSWatcher } from 'chokidar';
 import type WebSocket from 'ws';
 
+import type { CodexStreamParser } from '../modules/server/sessions/codex-parser';
 import type { HolderClient } from '../modules/server/terminal/holder-client';
 import type { ConversationMessage } from './sessions';
 
 // ── holder-client types ─────────────────────────────────────────────
 
+export interface CodexWatchState {
+  callbacks: Set<(messages: ConversationMessage[]) => void>;
+  idleTimer: null | ReturnType<typeof setTimeout>;
+  /** Incomplete trailing line buffered between reads. */
+  lineBuffer: string;
+  offset: number;
+  parser: CodexStreamParser;
+  watcher: FSWatcher;
+}
+
 /** Messages received from the holder process (local ndjson protocol). */
 export type HolderIncomingMessage =
   | { active: boolean; type: 'activity' }
@@ -22,19 +33,21 @@ export type HolderIncomingMessage =
   | { exitCode: null | number; exited: boolean; pid: number; type: 'info' }
   | { path: string; type: 'cwd' };
 
+// ── pty-manager types ───────────────────────────────────────────────
+
 /** Messages sent to the holder process (local ndjson protocol). */
 export type HolderOutgoingMessage =
   | { cols: number; rows: number; type: 'resize' }
   | { data: string; type: 'input' }
   | { signal?: string; type: 'kill' };
 
-// ── pty-manager types ───────────────────────────────────────────────
-
 /**
  * Callback invoked when new JSONL entries are parsed from a watched file.
  */
 export type OnNewEntries = (entries: ConversationMessage[]) => void;
 
+// ── session-watcher types ───────────────────────────────────────────
+
 export interface OpenCodeWatchState {
   callbacks: Set<(messages: ConversationMessage[]) => void>;
   /** Set of message IDs we have already emitted, to avoid duplicates. */
@@ -49,8 +62,6 @@ export interface OpenCodeWatchState {
   sessionId: string;
 }
 
-// ── session-watcher types ───────────────────────────────────────────
-
 export interface PtyManagedTerminal {
   args: string[];
   clients: Set<WebSocket>;
@@ -78,12 +89,14 @@ export interface PtyManagedTerminal {
   watcherOffset: number;
 }
 
+// ── opencode-watcher types ──────────────────────────────────────────
+
 export interface PtyOutputBuffer {
   data: string[];
   size: number;
 }
 
-// ── opencode-watcher types ──────────────────────────────────────────
+// ── codex-watcher types ─────────────────────────────────────────────
 
 export interface SessionWatchedFile {
   callbacks: Set<OnNewEntries>;

package/src/lib/types/sessions.ts

@@ -3,7 +3,7 @@
 // classes and `type: string` instead of the string-literal discriminated unions
 // required at runtime.
 
-import type { MessageRole } from './generated';
+import type { MessageRole, ProjectGroup, SessionSource } from './generated';
 
 /** Internal structure from ~/.claude/sessions/<PID>.json */
 export interface ClaudeSessionFile {
@@ -23,7 +23,16 @@ export interface ConversationMessage {
 }
 
 export interface DetectedProcess {
-  command: 'claude' | 'opencode';
+  command:
+    | 'amp'
+    | 'claude'
+    | 'codex'
+    | 'copilot'
+    | 'cursor-agent'
+    | 'gemini'
+    | 'iflow'
+    | 'opencode'
+    | 'qwen';
   cwd: string;
   kind: string;
   pid: number;
@@ -34,6 +43,18 @@ export interface DetectedProcess {
 
 export type MessagePart = TextPart | ThinkingPart | ToolResultPart | ToolUsePart;
 
+/** A registered AI-agent provider (see server/sessions/registry.ts). */
+export interface ProviderDef {
+  command: string;
+  getConversation: (sessionId: string, offset: number, limit: number) => ConversationMessage[];
+  isAI: boolean;
+  label: string;
+  listProjects: () => ProjectGroup[];
+  nameSuffix?: string;
+  resumeArgs: (sessionId: string) => string[];
+  source: SessionSource;
+}
+
 export interface TextPart {
   content: string;
   type: 'text';

package/src/routes/api/device-token/+server.ts

@@ -1,4 +1,3 @@
-import { env } from '$env/dynamic/private';
 import { validateAuth } from '$lib/modules/server/auth';
 import { json } from '@sveltejs/kit';
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'fs';
@@ -70,9 +69,14 @@ export const POST: RequestHandler = async ({ request }) => {
   tokens[platform] = token;
   writeTokens(tokens);
 
-  // Update in-memory env so APNs can use it immediately (iOS is the primary APNs target)
+  // Update in-memory env so APNs can use it immediately (iOS is the primary APNs target).
+  // SvelteKit's $env/dynamic/private exposes a Proxy whose getter reads process.env at
+  // access time but whose setter does NOT propagate to process.env. Assigning via the
+  // Proxy is a silent no-op, so subsequent /api/notify calls still read the stale value
+  // from .env. Write straight to process.env so env.DEVICE_TOKEN picks up the new token
+  // on the next read.
   if (platform === 'ios') {
-    (env as Record<string, string>).DEVICE_TOKEN = token;
+    process.env.DEVICE_TOKEN = token;
   }
 
   console.log(`[device-token] Registered ${platform} token (length: ${token.length})`);

package/src/routes/api/sessions/+server.ts

@@ -2,13 +2,9 @@ import type { ProjectGroup } from '$lib/types';
 
 import { validateAuth } from '$lib/modules/server/auth';
 import {
-  getSessionConversation,
-  listProjectsWithSessions,
-} from '$lib/modules/server/sessions/jsonl-reader';
-import {
-  getOpenCodeConversation,
-  listOpenCodeProjects,
-} from '$lib/modules/server/sessions/opencode-reader';
+  getProviderConversation,
+  listAllProviderProjects,
+} from '$lib/modules/server/sessions/registry';
 import { json } from '@sveltejs/kit';
 
 import type { RequestHandler } from './$types';
@@ -24,33 +20,7 @@ function getMergedProjects(): ProjectGroup[] {
     return cachedProjects;
   }
 
-  const claudeProjects = listProjectsWithSessions();
-  const openCodeProjects = listOpenCodeProjects();
-  const projectsByPath = new Map<string, ProjectGroup>();
-
-  for (const p of claudeProjects) {
-    projectsByPath.set(p.fullPath, { ...p });
-  }
-
-  for (const op of openCodeProjects) {
-    const existing = projectsByPath.get(op.fullPath);
-    if (existing) {
-      existing.sessions.push(...op.sessions);
-      existing.sessions.sort(
-        (a, b) => new Date(b.modified).getTime() - new Date(a.modified).getTime()
-      );
-      existing.sessionCount = existing.sessions.length;
-      existing.lastModified = existing.sessions[0]?.modified || existing.lastModified;
-      existing.name = existing.name.replace(' (OpenCode)', '');
-    } else {
-      op.name = op.name.replace(' (OpenCode)', '');
-      projectsByPath.set(op.fullPath, { ...op });
-    }
-  }
-
-  cachedProjects = [...projectsByPath.values()].sort(
-    (a, b) => new Date(b.lastModified).getTime() - new Date(a.lastModified).getTime()
-  );
+  cachedProjects = listAllProviderProjects();
   cacheTimestamp = now;
   return cachedProjects;
 }
@@ -86,12 +56,7 @@ export const GET: RequestHandler = ({ request, url }) => {
     const claudeProjectDir = matchedProject
       ? matchedProject.fullPath.replace(/\//g, '-')
       : undefined;
-    let messages = getSessionConversation(sessionId, offset, limit, claudeProjectDir);
-
-    // If Claude Code reader found nothing, try OpenCode
-    if (messages.length === 0) {
-      messages = getOpenCodeConversation(sessionId, offset, limit);
-    }
+    const messages = getProviderConversation(sessionId, offset, limit, claudeProjectDir);
 
     // Find session info — short-circuit when project is already resolved
     let sessionInfo = matchedProject?.sessions.find((s) => s.id === sessionId) ?? null;

package/src/routes/api/sessions/connect/+server.ts

@@ -1,4 +1,5 @@
 import { validateAuth } from '$lib/modules/server/auth';
+import { PROVIDER_COMMANDS, resumeArgsForCommand } from '$lib/modules/server/sessions/registry';
 import { ptyManager } from '$lib/modules/server/terminal/pty-manager';
 import { toErrorMessage } from '$lib/modules/server/utils/error';
 import { json } from '@sveltejs/kit';
@@ -34,12 +35,21 @@ export const POST: RequestHandler = async ({ request }) => {
     return json({ error: 'sessionId is required (string)' }, { status: 400 });
   }
 
+  // sessionId becomes a process argument (e.g. `codex resume <id>`); restrict it
+  // to safe identifier characters to prevent argument/path injection.
+  if (!/^[A-Za-z0-9_-]+$/.test(sessionId)) {
+    return json({ error: 'Invalid sessionId format' }, { status: 400 });
+  }
+
   if (!cwd || typeof cwd !== 'string') {
     return json({ error: 'cwd is required (string)' }, { status: 400 });
   }
 
-  if (!command || (command !== 'claude' && command !== 'opencode')) {
-    return json({ error: 'command must be "claude" or "opencode"' }, { status: 400 });
+  if (!command || !PROVIDER_COMMANDS.includes(command)) {
+    return json(
+      { error: `command must be one of: ${PROVIDER_COMMANDS.join(', ')}` },
+      { status: 400 }
+    );
   }
 
   // --- Validate cwd (same checks as POST /api/terminals) ---
@@ -63,13 +73,14 @@ export const POST: RequestHandler = async ({ request }) => {
 
   // --- Reuse existing terminal if one is already running for this session ---
 
-  const existing = ptyManager
-    .list()
-    .find(
-      (t) =>
-        t.status === 'running' &&
-        (t.sessionFile?.endsWith(`/${sessionId}.jsonl`) || t.openCodeSessionId === sessionId)
-    );
+  const existing = ptyManager.list().find(
+    (t) =>
+      t.status === 'running' &&
+      // Claude: <id>.jsonl ; Codex rollout: rollout-<ts>-<id>.jsonl ; OpenCode: session id
+      (t.sessionFile?.endsWith(`/${sessionId}.jsonl`) ||
+        t.sessionFile?.endsWith(`-${sessionId}.jsonl`) ||
+        t.openCodeSessionId === sessionId)
+  );
 
   if (existing) {
     console.log(
@@ -94,9 +105,9 @@ export const POST: RequestHandler = async ({ request }) => {
     return json({ error: 'No existing terminal for this session' }, { status: 404 });
   }
 
-  // --- Build args based on command ---
+  // --- Build args based on command (resume convention differs per agent CLI) ---
 
-  const args: string[] = command === 'claude' ? ['--resume', sessionId] : ['--session', sessionId];
+  const args: string[] = resumeArgsForCommand(command, sessionId);
 
   try {
     const terminal = await ptyManager.create(command, args, realCwd, 120, 40);

package/src/routes/api/terminals/+server.ts

@@ -1,13 +1,15 @@
 import { validateAuth } from '$lib/modules/server/auth';
+import { PROVIDER_COMMANDS } from '$lib/modules/server/sessions/registry';
 import { ptyManager } from '$lib/modules/server/terminal/pty-manager';
 import { toErrorMessage } from '$lib/modules/server/utils/error';
 import { json } from '@sveltejs/kit';
 import { realpathSync, statSync } from 'fs';
-import { basename, isAbsolute, relative } from 'path';
+import { isAbsolute, relative } from 'path';
 
 import type { RequestHandler } from './$types';
 
-const ALLOWED_COMMANDS = ['zsh', 'bash', 'sh', 'fish', 'claude', 'opencode'];
+// Plain shells + every registered AI-agent binary.
+const ALLOWED_COMMANDS = ['zsh', 'bash', 'sh', 'fish', ...PROVIDER_COMMANDS];
 
 /** Extract the last non-empty line from a scrollback string. */
 function lastScrollbackLine(scrollback: string): null | string {
@@ -86,9 +88,9 @@ export const POST: RequestHandler = async ({ request }) => {
       return json({ error: 'command is required' }, { status: 400 });
     }
 
-    // Issue 4: Command allowlist — only allow known safe commands
-    const commandBasename = basename(command);
-    if (!ALLOWED_COMMANDS.includes(commandBasename)) {
+    // Command allowlist — only bare allowlisted binary names. Reject any path
+    // component so an absolute path like "/tmp/bash" (basename "bash") can't slip through.
+    if (command.includes('/') || command.includes('\\') || !ALLOWED_COMMANDS.includes(command)) {
       return json(
         { error: `Command not allowed. Allowed: ${ALLOWED_COMMANDS.join(', ')}` },
         { status: 400 }