mstro-app 0.5.0 → 0.5.5

package/server/services/websocket/terminal-handlers.ts

@@ -1,7 +1,8 @@
 // Copyright (c) 2025-present Mstro, Inc. All rights reserved.
-// Licensed under the MIT License. See LICENSE file for details.
 
+import { statSync } from 'node:fs';
 import { platform } from 'node:os';
+import { isAbsolute } from 'node:path';
 import { AnalyticsEvents, trackEvent } from '../analytics.js';
 import { getPTYManager } from '../terminal/pty-manager.js';
 import type { HandlerContext } from './handler-context.js';
@@ -11,7 +12,7 @@ export async function handleTerminalMessage(ctx: HandlerContext, ws: WSContext,
   const termId = msg.terminalId || tabId;
   switch (msg.type) {
     case 'terminalInit':
-      await handleTerminalInit(ctx, ws, termId, workingDir, msg.data?.shell, msg.data?.cols, msg.data?.rows);
+      await handleTerminalInit(ctx, ws, termId, workingDir, msg.data?.cwd, msg.data?.shell, msg.data?.cols, msg.data?.rows);
       break;
     case 'terminalReconnect':
       handleTerminalReconnect(ctx, ws, termId);
@@ -36,6 +37,7 @@ async function handleTerminalInit(
   ws: WSContext,
   terminalId: string,
   workingDir: string,
+  requestedCwd?: string,
   requestedShell?: string,
   cols?: number,
   rows?: number,
@@ -57,10 +59,16 @@ async function handleTerminalInit(
   addTerminalSubscriber(ctx, terminalId, ws);
   setupTerminalBroadcastListeners(ctx, terminalId);
 
+  // Validate client-supplied cwd. Used by "Open in terminal" on a worktree
+  // row to spawn the PTY directly in the worktree path. Falls back silently
+  // to the connection-level workingDir on any failure (relative path, missing
+  // dir, file path, or stat error from a deleted worktree).
+  const effectiveCwd = resolveEffectiveCwd(requestedCwd, workingDir);
+
   try {
     const { shell, cwd, isReconnect, platform } = await ptyManager.create(
       terminalId,
-      workingDir,
+      effectiveCwd,
       cols || 80,
       rows || 24,
       requestedShell,
@@ -282,6 +290,34 @@ function setupTerminalBroadcastListeners(ctx: HandlerContext, terminalId: string
   });
 }
 
+/**
+ * Validate a client-supplied cwd and return the effective working directory
+ * to spawn the PTY in. Falls back to `workingDir` on any failure, so the
+ * caller can pass through whatever the client sent without pre-checking.
+ *
+ * Rejects: non-strings, relative paths, missing/inaccessible paths, file
+ * paths (must be a directory). Doesn't try to confirm the path is a known
+ * worktree — the threat model is bounded (view-only users are blocked at
+ * the relay; owners can `cd` anywhere from a PTY anyway).
+ */
+function resolveEffectiveCwd(requestedCwd: string | undefined, workingDir: string): string {
+  if (!requestedCwd || typeof requestedCwd !== 'string') return workingDir;
+  if (!isAbsolute(requestedCwd)) {
+    console.warn(`[terminalInit] Ignoring non-absolute cwd: ${requestedCwd}`);
+    return workingDir;
+  }
+  try {
+    if (!statSync(requestedCwd).isDirectory()) {
+      console.warn(`[terminalInit] Ignoring non-directory cwd: ${requestedCwd}`);
+      return workingDir;
+    }
+  } catch {
+    console.warn(`[terminalInit] Ignoring inaccessible cwd: ${requestedCwd}`);
+    return workingDir;
+  }
+  return requestedCwd;
+}
+
 /**
  * Clean up terminal subscribers for a disconnected WS context.
  * Called from handler.ts handleClose().

package/server/services/websocket/types.ts

@@ -1,5 +1,4 @@
 // Copyright (c) 2025-present Mstro, Inc. All rights reserved.
-// Licensed under the MIT License. See LICENSE file for details.
 
 /**
  * WebSocket Improvise Types
@@ -36,13 +35,13 @@ const GitTagMessages = ['gitListTags', 'gitCreateTag', 'gitPushTag'] as const;
 
 const GitWorktreeMessages = ['gitWorktreeList', 'gitWorktreeCreate', 'gitWorktreeCreateAndAssign', 'gitWorktreeRemove', 'tabWorktreeSwitch', 'gitWorktreePush', 'gitWorktreeCreatePR'] as const;
 
-const GitMergeMessages = ['gitMergePreview', 'gitWorktreeMerge', 'gitMergeAbort', 'gitMergeComplete'] as const;
+const GitMergeMessages = ['gitMergePreview', 'gitWorktreeMerge', 'gitMergeAbort', 'gitMergeComplete', 'gitMergeStashPop', 'gitMergeDiscardBlockers'] as const;
 
-const SessionSyncMessages = ['getActiveTabs', 'createTab', 'reorderTabs', 'syncTabMeta', 'removeTab', 'markTabViewed'] as const;
+const SessionSyncMessages = ['getActiveTabs', 'createTab', 'reorderTabs', 'syncTabMeta', 'removeTab', 'markTabViewed', 'setTabEngine'] as const;
 
 const SettingsMessages = ['getSettings', 'updateSettings'] as const;
 
-const QualityMessages = ['qualityDetectTools', 'qualityScan', 'qualityInstallTools', 'qualityCodeReview', 'qualityLoadState', 'qualitySaveDirectories'] as const;
+const QualityMessages = ['qualityDetectTools', 'qualityScan', 'qualityInstallTools', 'qualityCodeReview', 'qualityCancel', 'qualityLoadState', 'qualityClearPending', 'qualitySaveDirectories'] as const;
 
 const FileUploadMessages = ['fileUploadStart', 'fileUploadChunk', 'fileUploadComplete', 'fileUploadCancel'] as const;
 
@@ -56,6 +55,8 @@ const PlanSprintMessages = ['planCreateSprint', 'planActivateSprint', 'planCompl
 
 const SkillMessages = ['listSkills', 'chatToBoard'] as const;
 
+const InstanceMessages = ['shutdownInstance'] as const;
+
 type WebSocketMessageType =
   | typeof CoreMessages[number]
   | typeof TerminalMessages[number]
@@ -74,12 +75,33 @@ type WebSocketMessageType =
   | typeof PlanMessages[number]
   | typeof PlanBoardMessages[number]
   | typeof PlanSprintMessages[number]
-  | typeof SkillMessages[number];
+  | typeof SkillMessages[number]
+  | typeof InstanceMessages[number];
+
+/**
+ * AI engine identifier carried on WebSocket envelopes so the web client can
+ * render engine-specific affordances. Server relay forwards the field
+ * unchanged; missing values on inbound messages default to 'claude-code'.
+ */
+export type EngineId = 'claude-code' | 'opencode';
+
+export const DEFAULT_ENGINE_ID: EngineId = 'claude-code';
+
+/** Narrow an unknown engine value to a valid EngineId, defaulting to 'claude-code'. */
+export function normalizeEngineId(value: unknown): EngineId {
+  return value === 'opencode' ? 'opencode' : DEFAULT_ENGINE_ID;
+}
 
 export interface WebSocketMessage {
   type: WebSocketMessageType;
   tabId?: string;
   terminalId?: string;
+  /**
+   * Engine that produced / should handle this message. Optional on the wire —
+   * missing field is treated as 'claude-code' by receivers. Populated on
+   * prompt-send, session-state, and tab-state messages.
+   */
+  engine?: EngineId;
   // biome-ignore lint/suspicious/noExplicitAny: message envelope carries heterogeneous payloads — typed per-handler via destructuring
   data?: any;
   /** Injected by server relay for view-only shared users */
@@ -102,9 +124,9 @@ const GitTagResponseMessages = ['gitTagList', 'gitTagCreated', 'gitTagPushed'] a
 
 const GitWorktreeResponseMessages = ['gitWorktreeListResult', 'gitWorktreeCreated', 'gitWorktreeCreatedAndAssigned', 'gitWorktreeRemoved', 'tabWorktreeSwitched', 'gitBranchChanged', 'gitWorktreePushed', 'gitWorktreePRCreated'] as const;
 
-const GitMergeResponseMessages = ['gitMergePreviewResult', 'gitWorktreeMergeResult', 'gitMergeAborted', 'gitMergeCompleted'] as const;
+const GitMergeResponseMessages = ['gitMergePreviewResult', 'gitWorktreeMergeResult', 'gitMergeAborted', 'gitMergeCompleted', 'gitMergeStashPopped', 'gitMergeBlockersDiscarded'] as const;
 
-const SessionSyncResponseMessages = ['activeTabs', 'tabCreated', 'tabRemoved', 'tabRenamed', 'tabsReordered', 'tabViewed', 'tabStateChanged'] as const;
+const SessionSyncResponseMessages = ['activeTabs', 'tabCreated', 'tabRemoved', 'tabRenamed', 'tabsReordered', 'promptTextSync', 'tabViewed', 'tabStateChanged', 'tabEngineOverride'] as const;
 
 const SettingsResponseMessages = ['settings', 'settingsUpdated'] as const;
 
@@ -122,6 +144,8 @@ const PlanSprintResponseMessages = ['planSprintCreated', 'planSprintUpdated', 'p
 
 const SkillResponseMessages = ['skillsList', 'chatToBoardCreated'] as const;
 
+const InstanceResponseMessages = ['shuttingDown'] as const;
+
 type WebSocketResponseType =
   | typeof CoreResponseMessages[number]
   | typeof TerminalResponseMessages[number]
@@ -140,12 +164,19 @@ type WebSocketResponseType =
   | typeof PlanResponseMessages[number]
   | typeof PlanBoardResponseMessages[number]
   | typeof PlanSprintResponseMessages[number]
-  | typeof SkillResponseMessages[number];
+  | typeof SkillResponseMessages[number]
+  | typeof InstanceResponseMessages[number];
 
 export interface WebSocketResponse {
   type: WebSocketResponseType;
   tabId?: string;
   terminalId?: string;
+  /**
+   * Engine that produced this response. Populated by CLI handlers for
+   * prompt-send, session-state, and tab-state message categories so the web
+   * client can render engine-specific affordances.
+   */
+  engine?: EngineId;
   // biome-ignore lint/suspicious/noExplicitAny: message envelope carries heterogeneous payloads — typed per-handler via destructuring
   data?: any;
   /**

package/server/utils/agent-manager.ts

@@ -1,5 +1,4 @@
 // Copyright (c) 2025-present Mstro, Inc. All rights reserved.
-// Licensed under the MIT License. See LICENSE file for details.
 
 /**
  * Agent Manager

package/server/utils/paths.ts

@@ -1,5 +1,4 @@
 // Copyright (c) 2025-present Mstro, Inc. All rights reserved.
-// Licensed under the MIT License. See LICENSE file for details.
 
 /**
  * Path Utilities for Mstro Package

package/server/utils/port-manager.ts

@@ -1,5 +1,4 @@
 // Copyright (c) 2025-present Mstro, Inc. All rights reserved.
-// Licensed under the MIT License. See LICENSE file for details.
 
 /**
  * Port Manager - Finds available ports for Mstro instances

package/server/utils/port.ts

@@ -1,5 +1,4 @@
 // Copyright (c) 2025-present Mstro, Inc. All rights reserved.
-// Licensed under the MIT License. See LICENSE file for details.
 
 /**
  * Port utilities for finding available ports