Rename mark to staged and staged to differ (#391)

Author: wesbillman

.github/workflows/mark-ci.yml .github/workflows/differ-ci.yml.github/workflows/mark-ci.yml renamed to .github/workflows/differ-ci.yml

@@ -1,26 +1,26 @@
-name: Mark CI
+name: Differ CI
 
 on:
   pull_request:
     branches: [main]
     paths:
-      - "apps/mark/**"
+      - "apps/differ/**"
       - "packages/**"
       - "crates/**"
       - "pnpm-lock.yaml"
       - "pnpm-workspace.yaml"
       - "package.json"
-      - ".github/workflows/mark-ci.yml"
+      - ".github/workflows/differ-ci.yml"
   push:
     branches: [main]
     paths:
-      - "apps/mark/**"
+      - "apps/differ/**"
       - "packages/**"
       - "crates/**"
       - "pnpm-lock.yaml"
       - "pnpm-workspace.yaml"
       - "package.json"
-      - ".github/workflows/mark-ci.yml"
+      - ".github/workflows/differ-ci.yml"
   workflow_dispatch:
 
 env:
@@ -44,7 +44,7 @@ jobs:
       # Cache Cargo dependencies
       - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2
         with:
-          workspaces: apps/mark/src-tauri
+          workspaces: apps/differ/src-tauri
 
       # Install system dependencies for Tauri (Linux)
       - name: Install Tauri dependencies (Linux)
@@ -69,8 +69,8 @@ jobs:
       - name: Install dependencies
         run: |
           pnpm install --frozen-lockfile
-          cd apps/mark/src-tauri && cargo fetch
+          cd apps/differ/src-tauri && cargo fetch
 
       # Run all checks via the app justfile
       - name: Check all (fmt, lint, typecheck)
-        run: just -f apps/mark/justfile ci
+        run: just -f apps/differ/justfile ci

.github/workflows/staged-ci.yml

@@ -5,6 +5,7 @@ on:
     branches: [main]
     paths:
       - "apps/staged/**"
+      - "packages/**"
       - "crates/**"
       - "pnpm-lock.yaml"
       - "pnpm-workspace.yaml"
@@ -14,6 +15,7 @@ on:
     branches: [main]
     paths:
       - "apps/staged/**"
+      - "packages/**"
       - "crates/**"
       - "pnpm-lock.yaml"
       - "pnpm-workspace.yaml"

Cargo.toml

@@ -1,4 +1,4 @@
 [workspace]
 resolver = "2"
 members = ["crates/*"]
-exclude = ["apps/mark/src-tauri", "apps/staged/src-tauri"]
+exclude = ["apps/staged/src-tauri", "apps/differ/src-tauri"]

README.md

@@ -15,35 +15,35 @@ just setup
 Then run an app:
 
 ```bash
-just dev          # start Mark
-just dev staged   # start Staged
+just dev          # start Staged
+just dev differ   # start Differ
 ```
 
 ## App Installation
 
 For end-user installs:
 
-- Mark (macOS): `curl -fsSL https://raw.githubusercontent.com/block/builderbot/main/apps/mark/install.sh | bash`
-- Staged: no standalone installer yet; run from source with `just dev staged` or build with `just app staged build`
+- Staged (macOS): `curl -fsSL https://raw.githubusercontent.com/block/builderbot/main/apps/staged/install.sh | bash`
+- Differ: no standalone installer yet; run from source with `just dev differ` or build with `just app differ build`
 
 ## Command Guide
 
 The root `justfile` supports both styles:
 
 ```bash
-just dev staged     # verb-first (recommended for humans)
-just app staged dev # explicit delegation form
+just dev differ     # verb-first (recommended for humans)
+just app differ dev # explicit delegation form
 ```
 
 Useful commands:
 
 ```bash
 just apps         # list app names
 just setup        # first-time setup (hooks + JS deps)
-just dev          # run Mark app
-just dev staged   # run Staged app
-just mark         # alias for `just app mark dev`
+just dev          # run Staged app
+just dev differ   # run Differ app
 just staged       # alias for `just app staged dev`
+just differ       # alias for `just app differ dev`
 just check        # full non-modifying checks
 just ci           # alias of `just check`
 just fmt          # format repo
@@ -53,8 +53,8 @@ just test         # run Rust workspace tests
 
 ## Repo Layout
 
-- `apps/mark`: main desktop app.
-- `apps/staged`: standalone staged/diff app.
+- `apps/staged`: main desktop app.
+- `apps/differ`: standalone diff app.
 - `packages/diff-viewer`: shared Svelte diff viewer package.
 - `crates/`: shared Rust crates.
 - `scripts/`: helper scripts used by app tooling.
@@ -63,14 +63,14 @@ just test         # run Rust workspace tests
 
 Each app has its own `justfile` for app-specific workflows:
 
-- `apps/mark/justfile`
 - `apps/staged/justfile`
+- `apps/differ/justfile`
 
 Use root delegation to run any app recipe:
 
 ```bash
-just app mark ci
-just app staged build
+just app staged ci
+just app differ build
 ```
 
 ## Troubleshooting
@@ -84,4 +84,4 @@ just app staged build
 
 ## More Docs
 
-- Mark app docs: `apps/mark/README.md`
+- Staged app docs: `apps/staged/README.md`

apps/mark/.gitignore apps/differ/.gitignoreapps/mark/.gitignore renamed to apps/differ/.gitignore

@@ -2,11 +2,8 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Mark</title>
-    <!-- The window starts hidden and is shown by App.svelte after the
-         theme is applied, so no inline style hacks are needed here. -->
+    <title>Staged</title>
   </head>
   <body>
     <div id="app"></div>

apps/mark/index.html apps/differ/index.htmlapps/mark/index.html renamed to apps/differ/index.html

@@ -1,4 +1,4 @@
-# Mark - AI-Powered Development Workspace
+# Differ - Standalone Diff Viewer
 # Run `just dev` to start development.
 
 # ============================================================================
@@ -14,18 +14,13 @@ install:
 # Development
 # ============================================================================
 
-# Run the app in development mode (optionally point to another repo)
-dev repo="":
+# Run the app in development mode
+dev:
     #!/usr/bin/env bash
     set -euo pipefail
-
-    # Install JS deps if needed
     [[ -d node_modules ]] || pnpm install
 
-    # Derive a stable port from the working directory so the same worktree
-    # always gets the same port. This avoids changing TAURI_CONFIG between
-    # runs, which would invalidate Cargo's build cache and trigger a full
-    # Rust rebuild every time.
+    # Derive a stable port from the working directory
     VITE_PORT=$(python3 -c "import hashlib,os; h=int(hashlib.sha256(os.getcwd().encode()).hexdigest(),16); print(10000 + h % 55000)")
     export VITE_PORT
     TAURI_CONFIG="{\"build\":{\"devUrl\":\"http://localhost:${VITE_PORT}\",\"beforeDevCommand\":\"exec ./node_modules/.bin/vite --port ${VITE_PORT} --strictPort\"}}"
@@ -49,7 +44,6 @@ dev repo="":
     fi
 
     echo "Starting on port ${VITE_PORT}"
-    {{ if repo != "" { "export MARK_REPO=" + repo } else { "" } }}
     pnpm exec tauri dev --config "$TAURI_CONFIG"
 
 # Build the app for production

apps/mark/justfile apps/differ/justfileapps/mark/justfile renamed to apps/differ/justfile

@@ -1,7 +1,7 @@
 {
-  "name": "@builderbot/mark",
+  "name": "@builderbot/differ",
   "private": true,
-  "version": "0.3.0",
+  "version": "0.1.0",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -17,6 +17,7 @@
     "@tauri-apps/cli": "^2.10.0",
     "@tsconfig/svelte": "^5.0.6",
     "@types/node": "^24.10.1",
+    "@types/sanitize-html": "^2.13.0",
     "prettier": "^3.7.4",
     "prettier-plugin-svelte": "^3.4.1",
     "svelte": "^5.46.4",
@@ -27,16 +28,10 @@
   "dependencies": {
     "@builderbot/diff-viewer": "workspace:*",
     "@tauri-apps/api": "^2.10.0",
-    "@tauri-apps/plugin-clipboard-manager": "^2.3.2",
-    "@tauri-apps/plugin-dialog": "^2.6.0",
-    "@tauri-apps/plugin-store": "^2.4.2",
-    "ansi-to-html": "^0.7.2",
+    "@tauri-apps/plugin-store": "^2.2.0",
     "lucide-svelte": "^0.575.0",
     "marked": "^17.0.1",
     "sanitize-html": "^2.17.0",
     "shiki": "^3.20.0"
-  },
-  "overrides": {
-    "ajv": "8.18.0"
   }
 }