gitspace 0.2.0-rc.5 → 0.2.0-rc.6

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

@@ -0,0 +1,89 @@
+/**
+ * Workspace script execution with phase tracking
+ *
+ * Consolidates the logic for running pre/setup/select scripts with
+ * proper error handling and phase identification.
+ */
+
+import { runScriptsInTerminal, type RunScriptsOptions } from './run-scripts';
+import { hasSetupBeenRun, markSetupComplete } from './workspace-state';
+import { getScriptsPhaseDir, readProjectConfig } from '../core/config';
+import { getProjectSecrets } from './secrets';
+
+export type ScriptPhase = 'pre' | 'setup' | 'select';
+
+export interface RunWorkspaceScriptsOptions {
+  projectName: string;
+  workspacePath: string;
+  workspaceName: string;
+  repository: string;
+  /** If true, scripts can prompt for input. If false (default), stdin is closed. */
+  interactive?: boolean;
+}
+
+export type RunWorkspaceScriptsResult =
+  | { success: true }
+  | { success: false; phase: ScriptPhase; error: string };
+
+/**
+ * Run workspace scripts based on setup state.
+ *
+ * - If setup has already been run: runs select scripts only
+ * - If first time: runs pre scripts, then setup scripts, then marks setup complete
+ *
+ * Returns success or failure with the specific phase that failed.
+ */
+export async function runWorkspaceScripts(
+  options: RunWorkspaceScriptsOptions
+): Promise<RunWorkspaceScriptsResult> {
+  const { projectName, workspacePath, workspaceName, repository, interactive = false } = options;
+
+  // Read project config for bundle values and secrets
+  const config = readProjectConfig(projectName);
+
+  // Build script options
+  const scriptOptions: RunScriptsOptions = {
+    bundleValues: config.bundleValues,
+    nonInteractive: !interactive,
+  };
+
+  // Fetch secrets from OS keychain if we have secret keys
+  if (config.bundleSecretKeys && config.bundleSecretKeys.length > 0) {
+    scriptOptions.bundleSecrets = await getProjectSecrets(projectName, config.bundleSecretKeys);
+  }
+
+  // Check if setup has been run for this workspace
+  const setupAlreadyRun = hasSetupBeenRun(workspacePath);
+
+  if (setupAlreadyRun) {
+    // Run select scripts for existing workspace
+    const selectScriptsDir = getScriptsPhaseDir(projectName, 'select');
+    try {
+      await runScriptsInTerminal(selectScriptsDir, workspacePath, workspaceName, repository, scriptOptions);
+      return { success: true };
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      return { success: false, phase: 'select', error: message };
+    }
+  } else {
+    // First time accessing this workspace - run pre scripts, then setup scripts
+    let preScriptsSucceeded = false;
+
+    try {
+      const preScriptsDir = getScriptsPhaseDir(projectName, 'pre');
+      await runScriptsInTerminal(preScriptsDir, workspacePath, workspaceName, repository, scriptOptions);
+      preScriptsSucceeded = true;
+
+      const setupScriptsDir = getScriptsPhaseDir(projectName, 'setup');
+      await runScriptsInTerminal(setupScriptsDir, workspacePath, workspaceName, repository, scriptOptions);
+
+      // Only mark complete if both phases succeeded
+      markSetupComplete(workspacePath);
+      return { success: true };
+    } catch (error) {
+      const phase: ScriptPhase = preScriptsSucceeded ? 'setup' : 'pre';
+      const message = error instanceof Error ? error.message : String(error);
+      return { success: false, phase, error: message };
+    }
+  }
+}

package/src/utils/sanitize.ts

@@ -83,6 +83,70 @@ export function isValidWorkspaceName(name: string): boolean {
   return true;
 }
 
+/**
+ * Validate a git branch name according to git-check-ref-format rules
+ * See: https://git-scm.com/docs/git-check-ref-format
+ *
+ * @param name Branch name to validate
+ * @returns true if valid, false otherwise
+ */
+export function isValidBranchName(name: string): boolean {
+  if (!name || name.length === 0) {
+    return false;
+  }
+
+  // Cannot have two consecutive dots
+  if (name.includes('..')) {
+    return false;
+  }
+
+  // Cannot have ASCII control characters, space, tilde, caret, colon,
+  // question mark, asterisk, open bracket, or backslash
+  if (/[\x00-\x1f\x7f ~^:?*\[\\]/.test(name)) {
+    return false;
+  }
+
+  // Cannot start or end with a slash, or have consecutive slashes
+  if (name.startsWith('/') || name.endsWith('/') || name.includes('//')) {
+    return false;
+  }
+
+  // Cannot end with a dot
+  if (name.endsWith('.')) {
+    return false;
+  }
+
+  // Cannot contain @{
+  if (name.includes('@{')) {
+    return false;
+  }
+
+  // Cannot be exactly @
+  if (name === '@') {
+    return false;
+  }
+
+  // Cannot end with .lock
+  if (name.endsWith('.lock')) {
+    return false;
+  }
+
+  // Cannot start with a dash
+  if (name.startsWith('-')) {
+    return false;
+  }
+
+  // Each component cannot start with a dot
+  const components = name.split('/');
+  for (const component of components) {
+    if (component.startsWith('.') || component.length === 0) {
+      return false;
+    }
+  }
+
+  return true;
+}
+
 /**
  * Extract repository name from owner/repo format
  *

package/src/utils/workspace-state.ts

@@ -3,7 +3,7 @@
  * Tracks whether setup commands have been run for a workspace
  */
 
-import { existsSync, writeFileSync } from 'fs';
+import { existsSync, writeFileSync, unlinkSync } from 'fs';
 import { join } from 'path';
 import { SpacesError } from '../types/errors.js';
 
@@ -45,3 +45,19 @@ export function markSetupComplete(workspacePath: string): void {
     );
   }
 }
+
+/**
+ * Clear the setup marker for a workspace (for testing)
+ * @param workspacePath Absolute path to the workspace directory
+ */
+export function clearSetupMarker(workspacePath: string): void {
+  const markerPath = join(workspacePath, SETUP_MARKER_FILE);
+
+  try {
+    if (existsSync(markerPath)) {
+      unlinkSync(markerPath);
+    }
+  } catch {
+    // Ignore errors - this is just for testing
+  }
+}

package/src/version.generated.d.ts

@@ -0,0 +1,2 @@
+/** Generated at build time - see build script */
+export const VERSION: string;

package/.claude/settings.local.json

@@ -1,25 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "Bash(bun test:*)",
-      "Bash(xargs ls:*)",
-      "Bash(bun pm:*)",
-      "Bash(node -e:*)",
-      "Bash(bun run typecheck:*)",
-      "Bash(bun -e:*)",
-      "Bash(bun:*)",
-      "Bash(xargs:*)",
-      "Bash(timeout 2 bash -c 'echo \"\"invalid-base64\"\" | bun src/index.ts access add \"\"not-valid-base64-data\"\" 2>&1')",
-      "Bash(wc:*)",
-      "WebFetch(domain:ghostty.org)",
-      "Bash(xxd:*)",
-      "WebFetch(domain:ast-grep.github.io)",
-      "WebFetch(domain:developers.cloudflare.com)",
-      "WebFetch(domain:gitspace.sh)",
-      "Bash(/Users/bradleat/spaces/spaces/workspaces/remote-space/dist/gssh-darwin-arm64:*)",
-      "Bash(npx wrangler pages deploy:*)",
-      "Bash(git add:*)",
-      "Bash(git commit:*)"
-    ]
-  }
-}