gitspace 0.2.0-rc.12 → 0.2.0-rc.13

package/AGENTS.md

@@ -14,7 +14,7 @@ This document provides comprehensive information for AI assistants working on th
 - **X3DH handshake** for forward-secret session encryption
 - Web terminal interface (React + xterm.js)
 - Linear issue integration for workspace creation
-- Convention-based custom scripts in `.gitspace/` (pre, setup, select, remove phases)
+- Convention-based custom scripts in `.gitspace/scripts/` (pre, setup, select, remove phases)
 
 ## Architecture
 
@@ -27,7 +27,7 @@ This document provides comprehensive information for AI assistants working on th
 2. **Workspaces**: Individual git worktrees for features/branches
    - Located at `~/gitspace/<project-name>/workspaces/<workspace-name>/`
    - Each workspace has its own branch
-   - Scripts are sourced from `.gitspace/<phase>/` in the workspace (version-controlled)
+   - Scripts are sourced from `.gitspace/scripts/<phase>/` in the workspace (version-controlled)
 
 3. **Sessions**: PTY terminal sessions managed by tmux-lite
    - Can be attached from multiple clients

package/README.md

@@ -117,14 +117,15 @@ A bundle is a directory (typically `.gitspace/`) containing:
 ```
 .gitspace/
 ├── bundle.json           # Bundle manifest with onboarding steps
-├── pre/                  # Scripts to run before setup
-│   └── 01-copy-env.sh
-├── setup/                # Scripts to run on first workspace creation
-│   └── 01-install-deps.sh
-├── select/               # Scripts to run every time workspace is opened
-│   └── 01-status.sh
-└── remove/               # Scripts to run before workspace deletion
-    └── 01-cleanup.sh
+└── scripts/
+    ├── pre/              # Scripts to run before setup
+    │   └── 01-copy-env.sh
+    ├── setup/            # Scripts to run on first workspace creation
+    │   └── 01-install-deps.sh
+    ├── select/           # Scripts to run every time workspace is opened
+    │   └── 01-status.sh
+    └── remove/           # Scripts to run before workspace deletion
+        └── 01-cleanup.sh
 ```
 
 ### Bundle Manifest (`bundle.json`)
@@ -188,7 +189,7 @@ Bundle values are passed to scripts as environment variables:
 
 ```bash
 #!/bin/bash
-# .gitspace/select/01-status.sh
+# .gitspace/scripts/select/01-status.sh
 
 WORKSPACE_NAME=$1
 REPOSITORY=$2
@@ -361,10 +362,11 @@ inside each workspace so they can vary by branch:
 
 ```
 ~/gitspace/<project-name>/workspaces/<workspace-name>/.gitspace/
-├── pre/           # Run before setup (terminal)
-├── setup/         # Run once on workspace creation
-├── select/        # Run every time workspace is opened
-└── remove/        # Run before workspace deletion
+└── scripts/
+    ├── pre/       # Run before setup (terminal)
+    ├── setup/     # Run once on workspace creation
+    ├── select/    # Run every time workspace is opened
+    └── remove/    # Run before workspace deletion
 ```
 
 #### Script Execution Rules
@@ -406,19 +408,15 @@ export SPACES_CURRENT_PROJECT="my-app"
 │   ├── workspaces/              # Git worktrees
 │   │   └── <workspace-name>/
 │   │       ├── gitspace.lock    # Setup completion marker
-│   │       └── .prompt/         # Linear issue details (if applicable)
-│   │           └── issue.md
-│   └── workspaces/
-│       └── <workspace-name>/
-│           └── .gitspace/       # Custom scripts (per worktree)
-│               ├── pre/
-│               ├── setup/
-│               ├── select/
-│               └── remove/
-│       ├── pre/
-│       ├── setup/
-│       ├── select/
-│       └── remove/
+│   │       ├── .prompt/         # Linear issue details (if applicable)
+│   │       │   └── issue.md
+│   │       └── .gitspace/
+│   │           ├── bundle.json
+│   │           └── scripts/     # Custom scripts (per worktree)
+│   │               ├── pre/
+│   │               ├── setup/
+│   │               ├── select/
+│   │               └── remove/
 ```
 
 ## Remote Access

package/bun.lock

@@ -24,6 +24,7 @@
         "open": "^11.0.0",
         "ora": "^8.2.0",
         "react": "^19.2.4",
+        "react-dom": "^19.2.4",
         "simple-git": "^3.30.0",
         "ws": "^8.19.0",
       },
@@ -38,10 +39,10 @@
         "typescript": "^5.9.3",
       },
       "optionalDependencies": {
-        "@gitspace/darwin-arm64": "0.2.0-rc.11",
-        "@gitspace/darwin-x64": "0.2.0-rc.11",
-        "@gitspace/linux-arm64": "0.2.0-rc.11",
-        "@gitspace/linux-x64": "0.2.0-rc.11",
+        "@gitspace/darwin-arm64": "0.2.0-rc.12",
+        "@gitspace/darwin-x64": "0.2.0-rc.12",
+        "@gitspace/linux-arm64": "0.2.0-rc.12",
+        "@gitspace/linux-x64": "0.2.0-rc.12",
       },
     },
   },
@@ -62,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.11", "", { "os": "darwin", "cpu": "arm64", "bin": { "gssh-darwin-arm64": "bin/gssh" } }, "sha512-MCApLGdB9iScZ/IW1TiUlt+HwdYACfTJxw3m8tShb15IjhrNxn06GvKlTIIq5fR13XkPlPZNuX6/IxO00TVa5A=="],
+    "@gitspace/darwin-arm64": ["@gitspace/darwin-arm64@0.2.0-rc.12", "", { "os": "darwin", "cpu": "arm64", "bin": { "gssh-darwin-arm64": "bin/gssh" } }, "sha512-FUCz7f6EThB1/epRZ+X3SV7wDq/m4mFRDy2AVXGurVK6OWAA+D8tddUYeGmxvYT9+PXEZDATu5ukBh2RKpr5OQ=="],
 
     "@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=="],
 
@@ -578,7 +579,7 @@
 
     "react-devtools-core": ["react-devtools-core@7.0.1", "", { "dependencies": { "shell-quote": "^1.6.1", "ws": "^7" } }, "sha512-C3yNvRHaizlpiASzy7b9vbnBGLrhvdhl1CbdU6EnZgxPNbai60szdLtl+VL76UNOt5bOoVTOz5rNWZxgGt+Gsw=="],
 
-    "react-dom": ["react-dom@19.2.3", "", { "dependencies": { "scheduler": "^0.27.0" }, "peerDependencies": { "react": "^19.2.3" } }, "sha512-yELu4WmLPw5Mr/lmeEpox5rw3RETacE++JgHqQzd2dg+YbJuat3jH4ingc+WPZhxaoFzdv9y33G+F7Nl5O0GBg=="],
+    "react-dom": ["react-dom@19.2.4", "", { "dependencies": { "scheduler": "^0.27.0" }, "peerDependencies": { "react": "^19.2.4" } }, "sha512-AXJdLo8kgMbimY95O2aKQqsz2iWi9jMgKJhRBAxECE4IFxfcazB2LmzloIoibJI3C12IlY20+KFaLv+71bUJeQ=="],
 
     "react-is": ["react-is@17.0.2", "", {}, "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="],
 

package/docs/SITE_DOCS_FIGMA_MAKE.md

@@ -281,14 +281,15 @@ D) CUSTOM SCRIPTS & BUNDLES
 
 ### Custom Scripts
 
-GitSpace uses convention-based scripts stored per workspace in `.gitspace/`:
+GitSpace uses convention-based scripts stored per workspace in `.gitspace/scripts/`:
 
 ```
 ~/gitspace/<project>/workspaces/<workspace>/.gitspace/
-├── pre/      # Run before setup (once, in terminal)
-├── setup/    # Run on workspace creation (once)
-├── select/   # Run every time workspace is opened
-└── remove/   # Run before workspace deletion
+└── scripts/
+    ├── pre/      # Run before setup (once, in terminal)
+    ├── setup/    # Run on workspace creation (once)
+    ├── select/   # Run every time workspace is opened
+    └── remove/   # Run before workspace deletion
 ```
 
 Script execution rules:
@@ -298,7 +299,7 @@ Script execution rules:
 - Arguments: `$1` = workspace name, `$2` = repository name
 - Environment: Bundle values available as `SPACE_VALUE_*` and `SPACE_SECRET_*`
 
-Example script (`.gitspace/select/01-status.sh`):
+Example script (`.gitspace/scripts/select/01-status.sh`):
 ```bash
 #!/bin/bash
 WORKSPACE_NAME=$1
@@ -316,10 +317,11 @@ Bundles allow repository owners to share onboarding configurations. Place in `.g
 ```
 .gitspace/
 ├── bundle.json           # Bundle manifest with onboarding steps
-├── pre/                  # Scripts to run before setup
-├── setup/                # Scripts to run on first workspace creation
-├── select/               # Scripts to run every time workspace is opened
-└── remove/               # Scripts to run before workspace deletion
+└── scripts/
+    ├── pre/              # Scripts to run before setup
+    ├── setup/            # Scripts to run on first workspace creation
+    ├── select/           # Scripts to run every time workspace is opened
+    └── remove/           # Scripts to run before workspace deletion
 ```
 
 Bundle manifest example (`bundle.json`):
@@ -465,15 +467,15 @@ Location: `~/gitspace/.identity/`
 │   ├── workspaces/              # Git worktrees
 │   │   └── <workspace-name>/
 │   │       ├── gitspace.lock       # Setup completion marker
-│   │       └── .prompt/         # Linear issue details (if applicable)
-│   │           └── issue.md
-│   └── workspaces/
-│       └── <workspace-name>/
-│           └── .gitspace/       # Custom scripts (per worktree)
-│               ├── pre/
-│               ├── setup/
-│               ├── select/
-│               └── remove/
+│   │       ├── .prompt/         # Linear issue details (if applicable)
+│   │       │   └── issue.md
+│   │       └── .gitspace/
+│   │           ├── bundle.json
+│   │           └── scripts/     # Custom scripts (per worktree)
+│   │               ├── pre/
+│   │               ├── setup/
+│   │               ├── select/
+│   │               └── remove/
 ```
 
 ============================================================
@@ -621,8 +623,8 @@ gssh identity init --label "My Device"
 - Try: `git fetch origin` first
 
 **"Setup scripts failed"**
-- Check script is executable: `chmod +x .gitspace/setup/*.sh`
-- Run manually to see error: `./.gitspace/setup/01-script.sh`
+- Check script is executable: `chmod +x .gitspace/scripts/setup/*.sh`
+- Run manually to see error: `./.gitspace/scripts/setup/01-script.sh`
 - Check environment variables are set
 
 ### Bundle/Secrets Issues
@@ -893,14 +895,15 @@ gssh status      # Show daemon statuses
 
 SECTION: Local Workflow - Custom Scripts
 
-GitSpace uses convention-based scripts stored per workspace in `.gitspace/`:
+GitSpace uses convention-based scripts stored per workspace in `.gitspace/scripts/`:
 
 ```
 ~/gitspace/<project>/workspaces/<workspace>/.gitspace/
-├── pre/      # Run before setup (once)
-├── setup/    # Run on workspace creation (once)
-├── select/   # Run every time workspace is opened
-└── remove/   # Run before workspace deletion
+└── scripts/
+    ├── pre/      # Run before setup (once)
+    ├── setup/    # Run on workspace creation (once)
+    ├── select/   # Run every time workspace is opened
+    └── remove/   # Run before workspace deletion
 ```
 
 **Rules:**
@@ -912,7 +915,7 @@ GitSpace uses convention-based scripts stored per workspace in `.gitspace/`:
 **Example:**
 ```bash
 #!/bin/bash
-# .gitspace/select/01-status.sh
+# .gitspace/scripts/select/01-status.sh
 echo "Switching to: $1"
 git fetch origin
 git status
@@ -927,9 +930,11 @@ Bundles allow teams to share onboarding configurations. Place in `.gitspace/`:
 ```
 .gitspace/
 ├── bundle.json           # Manifest
-├── pre/                  # Pre-setup scripts
-├── setup/                # Setup scripts
-└── select/               # Select scripts
+└── scripts/
+    ├── pre/              # Pre-setup scripts
+    ├── setup/            # Setup scripts
+    ├── select/           # Select scripts
+    └── remove/           # Remove scripts
 ```
 
 **Manifest example:**

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

@@ -284,15 +284,16 @@ gssh status      # Show daemon statuses`} multiLine language="bash" />
           <h1 className="text-4xl font-bold mb-6">Custom Scripts</h1>
 
           <p className="text-zinc-400 mb-4">
-            GitSpace uses convention-based scripts stored per workspace in <code className="text-zinc-300">~/gitspace/&lt;project&gt;/workspaces/&lt;workspace&gt;/.gitspace/</code>:
+            GitSpace uses convention-based scripts stored per workspace in <code className="text-zinc-300">~/gitspace/&lt;project&gt;/workspaces/&lt;workspace&gt;/.gitspace/scripts/</code>:
           </p>
 
           <div className="bg-zinc-900 rounded-lg border border-zinc-800 p-4 font-mono text-sm mb-8">
             <pre className="text-zinc-300">{`~/gitspace/<project>/workspaces/<workspace>/.gitspace/
-├── pre/      # Run before setup (once)
-├── setup/    # Run on workspace creation (once)
-├── select/   # Run every time workspace is opened
-└── remove/   # Run before workspace deletion`}</pre>
+└── scripts/
+    ├── pre/      # Run before setup (once)
+    ├── setup/    # Run on workspace creation (once)
+    ├── select/   # Run every time workspace is opened
+    └── remove/   # Run before workspace deletion`}</pre>
           </div>
 
           <h3 className="text-xl font-semibold text-white mb-4">Rules</h3>
@@ -304,7 +305,7 @@ gssh status      # Show daemon statuses`} multiLine language="bash" />
           </ul>
 
           <h3 className="text-xl font-semibold text-white mb-4">Example Script</h3>
-          <p className="text-zinc-500 text-sm mb-2">.gitspace/select/01-status.sh</p>
+          <p className="text-zinc-500 text-sm mb-2">.gitspace/scripts/select/01-status.sh</p>
           <JsonBlock code={`#!/bin/bash
 echo "Switching to: $1"
 git fetch origin
@@ -324,9 +325,11 @@ git status`} />
           <div className="bg-zinc-900 rounded-lg border border-zinc-800 p-4 font-mono text-sm mb-8">
             <pre className="text-zinc-300">{`.gitspace/
 ├── bundle.json           # Manifest
-├── pre/                  # Pre-setup scripts
-├── setup/                # Setup scripts
-└── select/               # Select scripts`}</pre>
+└── scripts/
+    ├── pre/              # Pre-setup scripts
+    ├── setup/            # Setup scripts
+    ├── select/           # Select scripts
+    └── remove/           # Remove scripts`}</pre>
           </div>
 
           <h3 className="text-xl font-semibold text-white mb-4">Manifest Example</h3>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitspace",
-  "version": "0.2.0-rc.12",
+  "version": "0.2.0-rc.13",
   "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.12",
-    "@gitspace/darwin-x64": "0.2.0-rc.12",
-    "@gitspace/linux-x64": "0.2.0-rc.12",
-    "@gitspace/linux-arm64": "0.2.0-rc.12"
+    "@gitspace/darwin-arm64": "0.2.0-rc.13",
+    "@gitspace/darwin-x64": "0.2.0-rc.13",
+    "@gitspace/linux-x64": "0.2.0-rc.13",
+    "@gitspace/linux-arm64": "0.2.0-rc.13"
   },
   "keywords": [
     "cli",
@@ -59,6 +59,7 @@
     "open": "^11.0.0",
     "ora": "^8.2.0",
     "react": "^19.2.4",
+    "react-dom": "^19.2.4",
     "simple-git": "^3.30.0",
     "ws": "^8.19.0"
   },

package/src/commands/add.ts

@@ -184,7 +184,7 @@ export async function addProject(options: {
     baseBranch
   );
 
-  // Store bundle info if bundle was loaded (scripts are read from workspace .gitspace/)
+  // Store bundle info if bundle was loaded (scripts are read from workspace .gitspace/scripts/)
   if (loadedBundle) {
     // Store bundle values and info in project config
     const configUpdates: Record<string, unknown> = {};
@@ -447,7 +447,7 @@ export async function addWorkspace(
 
   // Run pre scripts if this is the first time (before tmux/setup)
   if (isFirstTime && !options.noSetup) {
-    const preScriptsDir = join(workspacePath, '.gitspace', 'pre');
+    const preScriptsDir = join(workspacePath, '.gitspace', 'scripts', 'pre');
     await runScriptsInTerminal(preScriptsDir, workspacePath, workspaceName, projectConfig.repository);
   }
 

package/src/core/shell.ts

@@ -59,7 +59,7 @@ export async function openWorkspaceShell(
 
 	if (selectOnly) {
 		// TUI mode: setup was done during creation, just run select scripts
-		const selectScriptsDir = join(workspacePath, '.gitspace', 'select')
+		const selectScriptsDir = join(workspacePath, '.gitspace', 'scripts', 'select')
 		await runScriptsInTerminal(
 			selectScriptsDir,
 			workspacePath,
@@ -73,7 +73,7 @@ export async function openWorkspaceShell(
 		// Determine which scripts to run based on setup status
 		if (setupAlreadyRun) {
 			// Setup has been run before, run select scripts
-			const selectScriptsDir = join(workspacePath, '.gitspace', 'select')
+			const selectScriptsDir = join(workspacePath, '.gitspace', 'scripts', 'select')
 			await runScriptsInTerminal(
 				selectScriptsDir,
 				workspacePath,
@@ -84,7 +84,7 @@ export async function openWorkspaceShell(
 		} else if (!noSetup) {
 			// First time setup, run setup scripts
 			printToTerminal('Running setup scripts (first time)...')
-			const setupScriptsDir = join(workspacePath, '.gitspace', 'setup')
+			const setupScriptsDir = join(workspacePath, '.gitspace', 'scripts', 'setup')
 			await runScriptsInTerminal(
 				setupScriptsDir,
 				workspacePath,

package/src/core/workspace.ts

@@ -122,7 +122,7 @@ export async function deleteWorkspaceCore(
   // Run remove scripts (cleanup before deletion)
   try {
     const projectConfig = readProjectConfig(projectName);
-    const removeScriptsDir = join(workspacePath, '.gitspace', 'remove');
+    const removeScriptsDir = join(workspacePath, '.gitspace', 'scripts', 'remove');
     options.onProgress?.('Running cleanup scripts...');
     await runScriptsInTerminal(
       removeScriptsDir,

package/src/lib/tmux-lite/server-lifecycle.test.ts

@@ -22,6 +22,10 @@ async function runCli(command: string): Promise<{ stdout: string; stderr: string
     cmd: ["bun", "run", CLI_SCRIPT, command, "--test"],
     stdout: "pipe",
     stderr: "pipe",
+    env: {
+      ...process.env,
+      TMUX_LITE: "",
+    },
   });
 
   const stdout = await new Response(proc.stdout).text();

package/src/shared/notifications/policy.test.ts

@@ -232,7 +232,7 @@ describe('itemToToast', () => {
     expect(toast.sessionId).toBe('session-1');
     expect(toast.sessionName).toBe('my-project:my-workspace:default');
     expect(toast.icon).toBe('✅');
-    expect(toast.title).toBe('Completed: npm test');
+    expect(toast.title).toBe('my-project / my-workspace / default: Completed - npm test');
     expect(toast.preview).toBe('Tests passed');
     expect(toast.item).toBe(item);
   });
@@ -248,7 +248,7 @@ describe('itemToToast', () => {
     const toast = itemToToast(item);
 
     expect(toast.icon).toBe('❌');
-    expect(toast.title).toBe('Exit code 1: npm build');
+    expect(toast.title).toBe('my-project / my-workspace / default: Exit code 1 - npm build');
   });
 
   it('should convert bell item', () => {
@@ -261,7 +261,7 @@ describe('itemToToast', () => {
     const toast = itemToToast(item);
 
     expect(toast.icon).toBe('🔔');
-    expect(toast.title).toBe('Bell');
+    expect(toast.title).toBe('my-project / my-workspace / default: Bell');
   });
 
   it('should convert idle item', () => {
@@ -274,7 +274,7 @@ describe('itemToToast', () => {
     const toast = itemToToast(item);
 
     expect(toast.icon).toBe('⏸️');
-    expect(toast.title).toBe('Activity Complete: vim');
+    expect(toast.title).toBe('my-project / my-workspace / default: Activity Complete - vim');
   });
 
   it('should convert title item', () => {
@@ -287,7 +287,7 @@ describe('itemToToast', () => {
     const toast = itemToToast(item);
 
     expect(toast.icon).toBe('📝');
-    expect(toast.title).toBe('Title Change: bash');
+    expect(toast.title).toBe('my-project / my-workspace / default: Title Change - bash');
   });
 
   it('should convert osc item', () => {
@@ -300,7 +300,7 @@ describe('itemToToast', () => {
     const toast = itemToToast(item);
 
     expect(toast.icon).toBe('📟');
-    expect(toast.title).toBe('OSC Notification: app');
+    expect(toast.title).toBe('my-project / my-workspace / default: OSC Notification - app');
   });
 
   it('should truncate long preview text', () => {

package/src/tui/app.tsx

@@ -1193,7 +1193,7 @@ function App({ relayConfig, onQuit }: AppProps) {
           return;
         }
 
-        // No onboarding, just create project (scripts are in workspace .gitspace/)
+        // No onboarding, just create project (scripts are in workspace .gitspace/scripts/)
         createProject(projectName, repo, baseBranch);
         updateProjectConfig(projectName, {
           appliedBundle: {

package/src/utils/__tests__/onboarding.test.ts

@@ -8,6 +8,11 @@
 import { describe, it, expect, beforeEach, afterEach, mock } from 'bun:test';
 
 describe('onboarding', () => {
+  async function loadOnboardingModule() {
+    const cacheBust = `${Date.now()}-${Math.random().toString(36).slice(2)}`;
+    return import(`../onboarding.ts?cacheBust=${cacheBust}`);
+  }
+
   // Store references to mock functions
   let mockPromptInput: (message: string, options?: { default?: string }) => Promise<string | null>;
   let mockPromptPassword: () => Promise<string | null>;
@@ -58,14 +63,14 @@ describe('onboarding', () => {
 
   describe('KEEP_EXISTING_SECRET constant', () => {
     it('should export the constant', async () => {
-      const { KEEP_EXISTING_SECRET } = await import('../onboarding');
+      const { KEEP_EXISTING_SECRET } = await loadOnboardingModule();
       expect(KEEP_EXISTING_SECRET).toBe('__KEEP_EXISTING_SECRET__');
     });
   });
 
   describe('runOnboarding', () => {
     it('should complete with empty steps', async () => {
-      const { runOnboarding } = await import('../onboarding');
+      const { runOnboarding } = await loadOnboardingModule();
       const result = await runOnboarding([]);
 
       expect(result.completed).toBe(true);
@@ -75,7 +80,7 @@ describe('onboarding', () => {
     it('should collect input values', async () => {
       mockPromptInput = async () => 'my-input';
 
-      const { runOnboarding } = await import('../onboarding');
+      const { runOnboarding } = await loadOnboardingModule();
       const result = await runOnboarding([
         {
           id: 'name-step',
@@ -93,7 +98,7 @@ describe('onboarding', () => {
     it('should collect secret values', async () => {
       mockPromptPassword = async () => 'my-secret';
 
-      const { runOnboarding } = await import('../onboarding');
+      const { runOnboarding } = await loadOnboardingModule();
       const result = await runOnboarding([
         {
           id: 'api-key',
@@ -111,7 +116,7 @@ describe('onboarding', () => {
     it('should handle info steps', async () => {
       mockPromptConfirm = async () => true;
 
-      const { runOnboarding } = await import('../onboarding');
+      const { runOnboarding } = await loadOnboardingModule();
       const result = await runOnboarding([
         {
           id: 'welcome',
@@ -127,7 +132,7 @@ describe('onboarding', () => {
     it('should handle confirm steps', async () => {
       mockPromptConfirm = async () => true;
 
-      const { runOnboarding } = await import('../onboarding');
+      const { runOnboarding } = await loadOnboardingModule();
       const result = await runOnboarding([
         {
           id: 'confirm-install',
@@ -143,7 +148,7 @@ describe('onboarding', () => {
     it('should handle cancelled input', async () => {
       mockPromptInput = async () => null;
 
-      const { runOnboarding } = await import('../onboarding');
+      const { runOnboarding } = await loadOnboardingModule();
       const result = await runOnboarding([
         {
           id: 'name-step',
@@ -161,7 +166,7 @@ describe('onboarding', () => {
     it('should handle cancelled info step', async () => {
       mockPromptConfirm = async () => false;
 
-      const { runOnboarding } = await import('../onboarding');
+      const { runOnboarding } = await loadOnboardingModule();
       const result = await runOnboarding([
         {
           id: 'welcome',
@@ -184,7 +189,7 @@ describe('onboarding', () => {
         return options?.default ?? '';
       };
 
-      const { runOnboarding } = await import('../onboarding');
+      const { runOnboarding } = await loadOnboardingModule();
       const result = await runOnboarding(
         [
           {
@@ -209,7 +214,7 @@ describe('onboarding', () => {
     it('should allow overriding previous value', async () => {
       mockPromptInput = async () => 'New Name';
 
-      const { runOnboarding } = await import('../onboarding');
+      const { runOnboarding } = await loadOnboardingModule();
       const result = await runOnboarding(
         [
           {
@@ -234,7 +239,7 @@ describe('onboarding', () => {
       // User confirms to keep existing
       mockPromptConfirm = async () => true;
 
-      const { runOnboarding, KEEP_EXISTING_SECRET } = await import('../onboarding');
+      const { runOnboarding, KEEP_EXISTING_SECRET } = await loadOnboardingModule();
       const result = await runOnboarding(
         [
           {
@@ -268,7 +273,7 @@ describe('onboarding', () => {
       };
       mockPromptPassword = async () => 'new-secret-value';
 
-      const { runOnboarding } = await import('../onboarding');
+      const { runOnboarding } = await loadOnboardingModule();
       const result = await runOnboarding(
         [
           {
@@ -292,7 +297,7 @@ describe('onboarding', () => {
     it('should not show keep existing prompt for new secrets', async () => {
       mockPromptPassword = async () => 'brand-new-secret';
 
-      const { runOnboarding } = await import('../onboarding');
+      const { runOnboarding } = await loadOnboardingModule();
       const result = await runOnboarding(
         [
           {
@@ -319,7 +324,7 @@ describe('onboarding', () => {
       };
       mockPromptConfirm = async () => true;
 
-      const { runOnboarding, KEEP_EXISTING_SECRET } = await import('../onboarding');
+      const { runOnboarding, KEEP_EXISTING_SECRET } = await loadOnboardingModule();
       const result = await runOnboarding(
         [
           {

package/src/utils/__tests__/run-workspace-scripts.test.ts

@@ -40,10 +40,10 @@ describe('runWorkspaceScripts', () => {
   beforeEach(() => {
     testDir = join(tmpdir(), `workspace-scripts-test-${Date.now()}-${Math.random().toString(36).slice(2)}`);
     workspacePath = join(testDir, 'workspace');
-    // Scripts are now in workspace/.gitspace/<phase>/
-    preScriptsDir = join(workspacePath, '.gitspace', 'pre');
-    setupScriptsDir = join(workspacePath, '.gitspace', 'setup');
-    selectScriptsDir = join(workspacePath, '.gitspace', 'select');
+    // Scripts are in workspace/.gitspace/scripts/<phase>/
+    preScriptsDir = join(workspacePath, '.gitspace', 'scripts', 'pre');
+    setupScriptsDir = join(workspacePath, '.gitspace', 'scripts', 'setup');
+    selectScriptsDir = join(workspacePath, '.gitspace', 'scripts', 'select');
 
     mkdirSync(preScriptsDir, { recursive: true });
     mkdirSync(setupScriptsDir, { recursive: true });

package/src/utils/run-workspace-scripts.ts

@@ -76,7 +76,7 @@ export async function runWorkspaceScripts(
 
   if (setupAlreadyRun) {
     // Run select scripts for existing workspace
-    const selectScriptsDir = join(workspacePath, '.gitspace', 'select');
+    const selectScriptsDir = join(workspacePath, '.gitspace', 'scripts', 'select');
     try {
       onPhaseStart?.('select');
       await runScriptsInTerminal(selectScriptsDir, workspacePath, workspaceName, repository, scriptOptions);
@@ -91,12 +91,12 @@ export async function runWorkspaceScripts(
 
     try {
       onPhaseStart?.('pre');
-      const preScriptsDir = join(workspacePath, '.gitspace', 'pre');
+      const preScriptsDir = join(workspacePath, '.gitspace', 'scripts', 'pre');
       await runScriptsInTerminal(preScriptsDir, workspacePath, workspaceName, repository, scriptOptions);
       preScriptsSucceeded = true;
 
       onPhaseStart?.('setup');
-      const setupScriptsDir = join(workspacePath, '.gitspace', 'setup');
+      const setupScriptsDir = join(workspacePath, '.gitspace', 'scripts', 'setup');
       await runScriptsInTerminal(setupScriptsDir, workspacePath, workspaceName, repository, scriptOptions);
 
       // Only mark complete if both phases succeeded