gitspace 0.2.0-rc.17 → 0.2.0-rc.19

package/.gitspace/{select → scripts/select}/01-status.sh

@@ -3,8 +3,8 @@
 #
 # This runs every time you switch to an existing workspace.
 #
-# Bundle values are available as environment variables using bundle key names.
-# Example: DEVELOPERNAME, EXAMPLEAPITOKEN
+# Bundle values are available using exact keys and uppercase snake-case aliases.
+# Example aliases: DEVELOPER_NAME, EXAMPLE_API_TOKEN
 
 WORKSPACE_NAME=$1
 REPOSITORY=$2
@@ -14,14 +14,14 @@ echo "=== Workspace: $WORKSPACE_NAME ==="
 echo ""
 
 # Show bundle values (proof of concept)
-if [ -n "$DEVELOPERNAME" ]; then
-  echo "Welcome back, $DEVELOPERNAME!"
+if [ -n "$DEVELOPER_NAME" ]; then
+  echo "Welcome back, $DEVELOPER_NAME!"
 fi
 
 # Show that we have access to the secret (masked)
-if [ -n "$EXAMPLEAPITOKEN" ]; then
+if [ -n "$EXAMPLE_API_TOKEN" ]; then
   # Only show first 4 characters to prove we have access
-  TOKEN_PREVIEW="${EXAMPLEAPITOKEN:0:4}..."
+  TOKEN_PREVIEW="${EXAMPLE_API_TOKEN:0:4}..."
   echo "API Token available: $TOKEN_PREVIEW (stored in OS keychain)"
 fi
 

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.
@@ -183,7 +199,7 @@ A bundle is a directory (typically `.gitspace/`) containing:
 Bundle values are passed to scripts as environment variables using the configured bundle keys:
 
 - `<KEY>` - Regular or secret value using the exact `configKey` from `bundle.json`
-- Legacy aliases `SPACE_VALUE_<KEY>` / `SPACE_SECRET_<KEY>` are also provided for compatibility
+- `<NORMALIZED_KEY>` - Uppercase snake-case alias (for example, `teamName` -> `TEAM_NAME`)
 
 **Example script:**
 
@@ -195,12 +211,12 @@ WORKSPACE_NAME=$1
 REPOSITORY=$2
 
 # Access bundle values
-if [ -n "$TEAMNAME" ]; then
-  echo "Welcome, $TEAMNAME team!"
+if [ -n "$TEAM_NAME" ]; then
+  echo "Welcome, $TEAM_NAME team!"
 fi
 
 # Access secrets (stored securely in OS keychain)
-if [ -n "$APIKEY" ]; then
+if [ -n "$API_KEY" ]; then
   echo "API Key configured"
 fi
 ```
@@ -393,9 +409,8 @@ inside each workspace so they can vary by branch:
 export SPACES_CURRENT_PROJECT="my-app"
 
 # Available in scripts (from bundle onboarding):
-# <KEY>                - Value by bundle config key name
-# SPACE_VALUE_<KEY>    - Legacy alias for regular values
-# SPACE_SECRET_<KEY>   - Legacy alias for secret values
+# <KEY>                - Value by exact bundle config key name
+# <NORMALIZED_KEY>     - Uppercase snake-case alias (e.g. teamName -> TEAM_NAME)
 ```
 
 ## Directory Structure

package/bun.lock

@@ -39,10 +39,10 @@
         "typescript": "^5.9.3",
       },
       "optionalDependencies": {
-        "@gitspace/darwin-arm64": "0.2.0-rc.15",
-        "@gitspace/darwin-x64": "0.2.0-rc.15",
-        "@gitspace/linux-arm64": "0.2.0-rc.15",
-        "@gitspace/linux-x64": "0.2.0-rc.15",
+        "@gitspace/darwin-arm64": "0.2.0-rc.17",
+        "@gitspace/darwin-x64": "0.2.0-rc.17",
+        "@gitspace/linux-arm64": "0.2.0-rc.17",
+        "@gitspace/linux-x64": "0.2.0-rc.17",
       },
     },
   },
@@ -63,7 +63,7 @@
 
     "@eslint/js": ["@eslint/js@8.57.1", "", {}, "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q=="],
 
-    "@gitspace/darwin-arm64": ["@gitspace/darwin-arm64@0.2.0-rc.15", "", { "os": "darwin", "cpu": "arm64", "bin": { "gssh-darwin-arm64": "bin/gssh" } }, "sha512-gjqsRdz2f7cOOTbj97wmQ4Z0nh7jWUVN4Dxj1N/Ex4fp6dJ8qu2d5izbsCHWVIPX4uN+gK/qqzxuwLwCdaEqlQ=="],
+    "@gitspace/darwin-arm64": ["@gitspace/darwin-arm64@0.2.0-rc.17", "", { "os": "darwin", "cpu": "arm64", "bin": { "gssh-darwin-arm64": "bin/gssh" } }, "sha512-aPei17D31di296UBdqOt59HrdvcIRL2oVGVRWT4etCIESgjTyhZQcCLsIezsWI4E4/9DQAqaLAfTif7TsuCRHQ=="],
 
     "@graphql-typed-document-node/core": ["@graphql-typed-document-node/core@3.2.0", "", { "peerDependencies": { "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" } }, "sha512-mB9oAsNCm9aM3/SOv4YtBMqZbYj10R7dkq8byBqxGY/ncFwhf2oQzMV+LCRlWoDSEBJ3COiR1yeDvMtsoOsuFQ=="],
 

package/docs/SITE_DOCS_FIGMA_MAKE.md

@@ -377,15 +377,14 @@ Using bundle values in scripts:
 ```bash
 #!/bin/bash
 # Values available as environment variables:
-# <KEY>               - Value by bundle config key name
-# SPACE_VALUE_<KEY>   - Legacy alias for regular values
-# SPACE_SECRET_<KEY>  - Legacy alias for secret values
+# <KEY>               - Value by exact bundle config key name
+# <NORMALIZED_KEY>    - Uppercase snake-case alias (e.g. teamName -> TEAM_NAME)
 
-if [ -n "$TEAMNAME" ]; then
-  echo "Welcome, $TEAMNAME team!"
+if [ -n "$TEAM_NAME" ]; then
+  echo "Welcome, $TEAM_NAME team!"
 fi
 
-if [ -n "$APIKEY" ]; then
+if [ -n "$API_KEY" ]; then
   echo "API Key configured"
 fi
 ```
@@ -960,8 +959,8 @@ Bundles allow teams to share onboarding configurations. Place in `.gitspace/`:
 
 **Using values in scripts:**
 ```bash
-echo "Team: $TEAMNAME"
-echo "Has API key: $APIKEY"
+echo "Team: $TEAM_NAME"
+echo "Has API key: $API_KEY"
 ```
 
 ---

package/landing-page/src/components/docs/DocsContent.tsx

@@ -378,8 +378,8 @@ git status`} />
           </div>
 
           <h3 className="text-xl font-semibold text-white mb-4">Using Values in Scripts</h3>
-          <JsonBlock code={`echo "Team: $TEAMNAME"
-echo "Has API key: $APIKEY"`} />
+          <JsonBlock code={`echo "Team: $TEAM_NAME"
+echo "Has API key: $API_KEY"`} />
         </div>
       );
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitspace",
-  "version": "0.2.0-rc.17",
+  "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.17",
-    "@gitspace/darwin-x64": "0.2.0-rc.17",
-    "@gitspace/linux-x64": "0.2.0-rc.17",
-    "@gitspace/linux-arm64": "0.2.0-rc.17"
+    "@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;