mstro-app 0.2.0 → 0.3.0

package/server/services/websocket/types.ts

@@ -55,6 +55,9 @@ export interface WebSocketMessage {
     | 'deleteFile'
     | 'renameFile'
     | 'notifyFileOpened'
+    | 'searchFileContents'
+    | 'cancelSearch'
+    | 'findDefinition'
     // Git message types
     | 'gitStatus'
     | 'gitStage'
@@ -62,12 +65,36 @@ export interface WebSocketMessage {
     | 'gitCommit'
     | 'gitCommitWithAI'
     | 'gitPush'
+    | 'gitPull'
     | 'gitLog'
     | 'gitDiscoverRepos'
     | 'gitSetDirectory'
     | 'gitGetRemoteInfo'
     | 'gitCreatePR'
     | 'gitGeneratePRDescription'
+    // Branch operations
+    | 'gitListBranches'
+    | 'gitCheckout'
+    | 'gitCreateBranch'
+    | 'gitDeleteBranch'
+    // Diff operations
+    | 'gitDiff'
+    // Tag operations
+    | 'gitListTags'
+    | 'gitCreateTag'
+    | 'gitPushTag'
+    // Worktree operations
+    | 'gitWorktreeList'
+    | 'gitWorktreeCreate'
+    | 'gitWorktreeRemove'
+    | 'tabWorktreeSwitch'
+    | 'gitWorktreePush'
+    | 'gitWorktreeCreatePR'
+    // Merge operations
+    | 'gitMergePreview'
+    | 'gitWorktreeMerge'
+    | 'gitMergeAbort'
+    | 'gitMergeComplete'
     // Session sync message types
     | 'getActiveTabs'
     | 'createTab'
@@ -109,6 +136,7 @@ export interface WebSocketResponse {
     | 'tabInitialized'
     | 'approvalRequired'
     | 'toolUse'
+    | 'streamingTokens'
     | 'notificationSummary'
     | 'terminalOutput'
     | 'terminalReady'
@@ -124,6 +152,10 @@ export interface WebSocketResponse {
     | 'fileRenamed'
     | 'fileOpened'
     | 'fileContentChanged'
+    | 'contentSearchResults'
+    | 'contentSearchComplete'
+    | 'contentSearchError'
+    | 'definitionResult'
     // Terminal sync response types
     | 'terminalCreated'
     | 'terminalClosed'
@@ -134,6 +166,7 @@ export interface WebSocketResponse {
     | 'gitCommitted'
     | 'gitCommitMessage'
     | 'gitPushed'
+    | 'gitPulled'
     | 'gitLog'
     | 'gitError'
     | 'gitReposDiscovered'
@@ -141,6 +174,29 @@ export interface WebSocketResponse {
     | 'gitRemoteInfo'
     | 'gitPRCreated'
     | 'gitPRDescription'
+    // Branch response types
+    | 'gitBranchList'
+    | 'gitCheckedOut'
+    | 'gitBranchCreated'
+    | 'gitBranchDeleted'
+    // Diff response types
+    | 'gitDiffResult'
+    // Tag response types
+    | 'gitTagList'
+    | 'gitTagCreated'
+    | 'gitTagPushed'
+    // Worktree response types
+    | 'gitWorktreeListResult'
+    | 'gitWorktreeCreated'
+    | 'gitWorktreeRemoved'
+    | 'tabWorktreeSwitched'
+    | 'gitWorktreePushed'
+    | 'gitWorktreePRCreated'
+    // Merge response types
+    | 'gitMergePreviewResult'
+    | 'gitWorktreeMergeResult'
+    | 'gitMergeAborted'
+    | 'gitMergeCompleted'
     // Session sync response types
     | 'activeTabs'
     | 'tabCreated'
@@ -372,3 +428,82 @@ export interface GitDirectorySetResponse {
   /** Whether the directory is valid (contains .git) */
   isValid: boolean;
 }
+
+// ============================================================================
+// Branch Types
+// ============================================================================
+
+export interface GitBranchEntry {
+  /** Branch name, e.g. "feat/auth" or "origin/main" */
+  name: string;
+  /** Short commit hash */
+  shortHash: string;
+  /** Whether this is a remote branch */
+  isRemote: boolean;
+  /** Whether this is the currently checked out branch */
+  isCurrent: boolean;
+  /** Tracking branch, e.g. "origin/feat/auth" */
+  upstream?: string;
+}
+
+// ============================================================================
+// Tag Types
+// ============================================================================
+
+export interface GitTagEntry {
+  /** Tag name */
+  name: string;
+  /** Short commit hash */
+  shortHash: string;
+  /** Creation date (ISO string) */
+  date: string;
+  /** Tag message (empty for lightweight tags) */
+  message: string;
+}
+
+// ============================================================================
+// Worktree Types
+// ============================================================================
+
+export interface WorktreeInfo {
+  /** Absolute path to the worktree directory */
+  path: string;
+  /** Branch checked out in this worktree */
+  branch: string;
+  /** HEAD commit hash */
+  head: string;
+  /** Whether this is the main working tree */
+  isMain: boolean;
+  /** Whether this is a bare repository */
+  isBare: boolean;
+  /** Whether this worktree can be pruned */
+  prunable?: boolean;
+}
+
+// ============================================================================
+// Merge Types
+// ============================================================================
+
+export interface MergePreviewResult {
+  /** Whether the merge can be done cleanly */
+  clean: boolean;
+  /** List of conflicting file paths */
+  conflicts: string[];
+  /** Diff stat summary */
+  stat: string;
+  /** List of commits to be merged */
+  commits: { hash: string; message: string }[];
+  /** Number of commits ahead */
+  ahead: number;
+}
+
+export interface WorktreeMergeResult {
+  /** Whether the merge succeeded */
+  success: boolean;
+  /** Merge commit hash (if successful) */
+  mergeCommit?: string;
+  /** Error message (if failed) */
+  error?: string;
+  /** List of conflicting files (if conflicts) */
+  conflictFiles?: string[];
+}

package/bin/release.sh

@@ -1,110 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-# Release script for mstro
-# Usage: ./bin/release.sh [major|minor|patch]
-#
-# This script:
-# 1. Bumps the version in package.json
-# 2. Updates CHANGELOG.md with git commits since last tag
-# 3. Commits the changes
-# 4. Creates a git tag
-# 5. Pushes to GitHub (branch + tag)
-#
-# After push, run `npm publish` to publish to npmjs.
-
-BUMP_TYPE="${1:-patch}"
-
-if [[ "$BUMP_TYPE" != "major" && "$BUMP_TYPE" != "minor" && "$BUMP_TYPE" != "patch" ]]; then
-  echo "Usage: $0 [major|minor|patch]"
-  exit 1
-fi
-
-# Ensure we're in the cli directory
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-CLI_DIR="$(dirname "$SCRIPT_DIR")"
-cd "$CLI_DIR"
-
-# Ensure working directory is clean
-if [[ -n "$(git status --porcelain)" ]]; then
-  echo "Error: Working directory is not clean. Commit or stash changes first."
-  exit 1
-fi
-
-# Get current version
-CURRENT_VERSION=$(node -e "console.log(require('./package.json').version)")
-echo "Current version: $CURRENT_VERSION"
-
-# Calculate new version
-IFS='.' read -r MAJOR MINOR PATCH <<< "$CURRENT_VERSION"
-case "$BUMP_TYPE" in
-  major) MAJOR=$((MAJOR + 1)); MINOR=0; PATCH=0 ;;
-  minor) MINOR=$((MINOR + 1)); PATCH=0 ;;
-  patch) PATCH=$((PATCH + 1)) ;;
-esac
-NEW_VERSION="$MAJOR.$MINOR.$PATCH"
-echo "New version: $NEW_VERSION"
-
-# Get the last tag (or first commit if no tags)
-LAST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || git rev-list --max-parents=0 HEAD)
-
-# Generate changelog entry from git commits
-CHANGELOG_ENTRY="## $NEW_VERSION ($(date +%Y-%m-%d))\n\n"
-COMMITS=$(git log "$LAST_TAG"..HEAD --pretty=format:"- %s" --no-merges 2>/dev/null || git log --pretty=format:"- %s" --no-merges)
-
-if [[ -z "$COMMITS" ]]; then
-  CHANGELOG_ENTRY+="- Release $NEW_VERSION\n"
-else
-  CHANGELOG_ENTRY+="$COMMITS\n"
-fi
-
-# Update CHANGELOG.md
-if [[ -f CHANGELOG.md ]]; then
-  # Insert new entry after the header
-  EXISTING=$(cat CHANGELOG.md)
-  {
-    echo "# Changelog"
-    echo ""
-    echo -e "$CHANGELOG_ENTRY"
-    # Strip the first line (# Changelog) and any leading blank lines from existing
-    echo "$EXISTING" | tail -n +2
-  } > CHANGELOG.md
-else
-  {
-    echo "# Changelog"
-    echo ""
-    echo -e "$CHANGELOG_ENTRY"
-  } > CHANGELOG.md
-fi
-
-# Bump version in package.json (without npm creating a git tag)
-npm version "$NEW_VERSION" --no-git-tag-version
-
-echo ""
-echo "Updated:"
-echo "  - package.json: $CURRENT_VERSION -> $NEW_VERSION"
-echo "  - CHANGELOG.md: added $NEW_VERSION entry"
-
-# Commit and tag
-git add package.json package-lock.json CHANGELOG.md
-git commit -m "release: v$NEW_VERSION"
-git tag -a "v$NEW_VERSION" -m "v$NEW_VERSION"
-
-echo ""
-echo "Created commit and tag v$NEW_VERSION"
-
-# Push
-echo ""
-read -rp "Push to origin? (y/N) " CONFIRM
-if [[ "$CONFIRM" =~ ^[Yy]$ ]]; then
-  git push origin HEAD
-  git push origin "v$NEW_VERSION"
-  echo ""
-  echo "Pushed to GitHub. Now run 'npm publish' to publish to npmjs."
-else
-  echo ""
-  echo "Skipped push. Run manually:"
-  echo "  git push origin HEAD"
-  echo "  git push origin v$NEW_VERSION"
-  echo "  npm publish"
-fi