gitspace 0.2.0-rc.18 → 0.2.0-rc.19

package/README.md

@@ -106,6 +106,22 @@ gssh switch
 gssh switch my-feature
 ```
 
+### Workspace Session Mode (`space`)
+
+When GitSpace opens a workspace-scoped terminal session, it injects a `space` shell function (bash/zsh).
+
+- Use `space ...` for workspace operations without repeating `--project` and `--workspace`
+- `gssh` commands are restricted in this mode to avoid cross-workspace mistakes
+- `gssh tmux ...` is blocked inside workspace sessions
+
+Examples:
+
+```bash
+space context --json
+space review hunks src/app.ts --format json
+space review add-hunk src/app.ts --index 1 --approve --body "Looks good"
+```
+
 ## Repo Config Bundles
 
 Repo config bundles allow repository owners to share onboarding configurations with their team. When someone clones a project that contains a bundle, they'll be guided through setup steps and have scripts automatically installed.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitspace",
-  "version": "0.2.0-rc.18",
+  "version": "0.2.0-rc.19",
   "description": "CLI for managing GitHub workspaces with git worktrees and secure remote terminal access",
   "bin": {
     "gssh": "./bin/gssh"
@@ -17,10 +17,10 @@
     "relay": "bun src/relay/index.ts"
   },
   "optionalDependencies": {
-    "@gitspace/darwin-arm64": "0.2.0-rc.18",
-    "@gitspace/darwin-x64": "0.2.0-rc.18",
-    "@gitspace/linux-x64": "0.2.0-rc.18",
-    "@gitspace/linux-arm64": "0.2.0-rc.18"
+    "@gitspace/darwin-arm64": "0.2.0-rc.19",
+    "@gitspace/darwin-x64": "0.2.0-rc.19",
+    "@gitspace/linux-x64": "0.2.0-rc.19",
+    "@gitspace/linux-arm64": "0.2.0-rc.19"
   },
   "keywords": [
     "cli",

package/src/app.web.tsx

@@ -19,6 +19,7 @@ import { useUserActivity } from "./hooks/index.js";
 import { useBundleRefreshAttachFlow } from './session/useBundleRefreshAttachFlow.js';
 import { useAttachController } from './app/session/useAttachController.js';
 import { useWorkspaceDeleteFlow } from './app/session/useWorkspaceDeleteFlow.js';
+import { ReviewPage } from './pages/ReviewPage.web.js';
 
 // Import shared components and hooks
 import {
@@ -27,6 +28,7 @@ import {
   useFlow,
   getDefaultShortcuts,
   type MachineInfo,
+  type WorkspaceInfo,
 } from "./components/index.js";
 import { MachineListWeb } from "./components/MachineList.web.js";
 import { SpacesBrowserWeb } from "./components/SpacesBrowser.web.js";
@@ -46,7 +48,7 @@ import {
   resolveSessionBrowserCommand,
 } from './app/input/sessionCommands.js';
 
-type View = "machines" | "terminal";
+type View = "machines" | "terminal" | "review";
 
 const PAGE_UP = '\x1b[5~';
 const PAGE_DOWN = '\x1b[6~';
@@ -88,6 +90,13 @@ export default function App() {
     inviteToken?: string;
   } | null>(null);
 
+  // Review workspace/project state
+  const [reviewWorkspace, setReviewWorkspace] = useState<{
+    projectName: string;
+    workspaceId: string;
+    workspaceLabel?: string;
+  } | null>(null);
+
   // Relay connection (for machine list)
   const relay = useRelayConnection();
 
@@ -234,7 +243,7 @@ export default function App() {
     setLocalNotificationConfig(terminal.notificationConfig);
   }, [terminal.notificationConfig]);
 
-  // Parse invite from URL hash on load
+  // Parse invite from URL hash on load, and review params from query string
   useEffect(() => {
     const hash = window.location.hash;
     if (hash.startsWith("#invite=")) {
@@ -248,6 +257,16 @@ export default function App() {
         }
       });
     }
+
+    const params = new URLSearchParams(window.location.search);
+    if (params.get('view') === 'review') {
+      const ws = params.get('workspace');
+      const proj = params.get('project');
+      if (ws && proj) {
+        setReviewWorkspace({ projectName: proj, workspaceId: ws, workspaceLabel: ws });
+        setView('review');
+      }
+    }
   }, []);
 
   // Auto-connect on load (no token required for personal relays)
@@ -419,6 +438,16 @@ export default function App() {
     await attachController.attachFromSelection(params);
   }, [attachController]);
 
+  // Handle opening review for a workspace
+  const handleOpenReview = useCallback((workspace: WorkspaceInfo) => {
+    setReviewWorkspace({
+      projectName: workspace.projectName,
+      workspaceId: workspace.id,
+      workspaceLabel: workspace.name,
+    });
+    setView('review');
+  }, []);
+
   // Spaces browser hook
   const spacesBrowserProps = useSpacesBrowser({
     workspaces: terminal.workspaces,
@@ -740,6 +769,59 @@ export default function App() {
     return () => window.removeEventListener("keydown", handleKeyDown);
   }, [notifications.activeToast, notifications.attachToActiveToast, flow]);
 
+  // ========== Review View ==========
+  if (view === 'review' && reviewWorkspace) {
+    if (terminal.status === 'established') {
+      return (
+        <>
+          <ReviewPage
+            projectName={reviewWorkspace.projectName}
+            workspaceName={reviewWorkspace.workspaceId}
+            workspaceLabel={reviewWorkspace.workspaceLabel}
+            machineName={selectedMachine?.label || selectedMachine?.machineId}
+            sendReviewRequest={terminal.sendReviewRequest}
+            onBack={() => {
+              setView('terminal');
+              setReviewWorkspace(null);
+            }}
+          />
+          <Toaster theme="dark" position="top-right" richColors />
+        </>
+      );
+    }
+
+    // Connection not yet established — show a targeted connecting screen
+    // rather than falling through to the generic machine list.
+    const statusMessage = {
+      disconnected: "Disconnected",
+      connecting: "Connecting to relay...",
+      connected: "Connected, authenticating...",
+      handshaking: "Establishing secure connection...",
+      established: "Connected!",
+      error: "Connection failed",
+    }[terminal.status];
+
+    return (
+      <>
+        <div className="h-screen w-screen flex flex-col items-center justify-center bg-[#0d1117] px-4">
+          <div className="text-center">
+            <div className="text-lg text-[#e6edf3] mb-2">
+              Loading review for <span className="text-[#58a6ff]">{reviewWorkspace.workspaceLabel ?? reviewWorkspace.workspaceId}</span>
+            </div>
+            <div className="text-sm text-[#8b949e]">{statusMessage}</div>
+            <button
+              onClick={() => { setView('machines'); setReviewWorkspace(null); }}
+              className="mt-4 px-6 py-3 text-base bg-[#21262d] hover:bg-[#30363d] rounded-lg text-[#e6edf3] min-h-[48px] border border-[#30363d]"
+            >
+              Back to Machines
+            </button>
+          </div>
+        </div>
+        <Toaster theme="dark" position="top-right" richColors />
+      </>
+    );
+  }
+
   // ========== Spaces Browser View (browsing mode) ==========
   if (
     view === 'terminal' &&
@@ -819,7 +901,7 @@ export default function App() {
             </div>
           </div>
           <div className="flex-1 overflow-hidden">
-            <SpacesBrowserWeb {...spacesBrowserProps} />
+            <SpacesBrowserWeb {...spacesBrowserProps} onReview={handleOpenReview} />
           </div>
         </div>
         <FlowWeb flow={flow} />

package/src/commands/bundle.ts

@@ -8,15 +8,16 @@ import { exec } from 'child_process';
 import { promisify } from 'util';
 import { logger } from '../utils/logger.js';
 import { SpacesError } from '../types/errors.js';
-import { getCurrentProject, getProjectBaseDir, getProjectWorkspacesDir } from '../core/config.js';
+import { getCurrentProject, getGitspaceDir, getProjectBaseDir, getProjectWorkspacesDir } from '../core/config.js';
 import {
   detectBundleChanges,
   formatBundleChangeDetails,
   refreshBundle,
   type BundleRefreshOptions,
 } from '../core/bundle-refresh.js';
-import { join, resolve } from 'path';
+import { join } from 'path';
 import { existsSync } from 'fs';
+import { detectWorkspaceContextFromCwd } from '../utils/workspace-id.js';
 
 const execAsync = promisify(exec);
 
@@ -43,24 +44,16 @@ export interface BundleStatusOptions {
  * Returns the workspace path if found, undefined otherwise
  */
 function detectWorkspaceFromCwd(projectName: string): string | undefined {
-  const cwd = process.cwd();
   const workspacesDir = getProjectWorkspacesDir(projectName);
 
-  // Check if cwd is inside the workspaces directory
-  const resolvedCwd = resolve(cwd);
-  const resolvedWorkspacesDir = resolve(workspacesDir);
-
-  if (resolvedCwd.startsWith(resolvedWorkspacesDir + '/') || resolvedCwd === resolvedWorkspacesDir) {
-    // Extract the workspace name (first path segment after workspaces/)
-    const relativePath = resolvedCwd.slice(resolvedWorkspacesDir.length + 1);
-    const workspaceName = relativePath.split('/')[0];
+  const context = detectWorkspaceContextFromCwd(process.cwd(), getGitspaceDir());
+  if (!context || context.projectName !== projectName) {
+    return undefined;
+  }
 
-    if (workspaceName) {
-      const workspacePath = join(workspacesDir, workspaceName);
-      if (existsSync(workspacePath)) {
-        return workspacePath;
-      }
-    }
+  const workspacePath = join(workspacesDir, context.workspaceName);
+  if (existsSync(workspacePath)) {
+    return workspacePath;
   }
 
   return undefined;