@gricha/perry 0.0.1 → 0.1.0

package/dist/workspace/manager.js

@@ -2,11 +2,12 @@ import { createServer } from 'net';
 import fs from 'fs/promises';
 import path from 'path';
 import os from 'os';
+import pkg from '../../package.json';
 import { StateManager } from './state';
 import { expandPath } from '../config/loader';
 import * as docker from '../docker';
 import { getContainerName } from '../docker';
-import { VOLUME_PREFIX, WORKSPACE_IMAGE, SSH_PORT_RANGE_START, SSH_PORT_RANGE_END, } from '../shared/constants';
+import { VOLUME_PREFIX, WORKSPACE_IMAGE_LOCAL, WORKSPACE_IMAGE_REGISTRY, SSH_PORT_RANGE_START, SSH_PORT_RANGE_END, } from '../shared/constants';
 async function findAvailablePort(start, end) {
     for (let port = start; port <= end; port++) {
         const available = await new Promise((resolve) => {
@@ -23,6 +24,21 @@ async function findAvailablePort(start, end) {
     }
     throw new Error(`No available port in range ${start}-${end}`);
 }
+async function ensureWorkspaceImage() {
+    const registryImage = `${WORKSPACE_IMAGE_REGISTRY}:${pkg.version}`;
+    const localExists = await docker.imageExists(WORKSPACE_IMAGE_LOCAL);
+    if (localExists) {
+        return WORKSPACE_IMAGE_LOCAL;
+    }
+    console.log(`Pulling workspace image ${registryImage}...`);
+    const pulled = await docker.tryPullImage(registryImage);
+    if (pulled) {
+        return registryImage;
+    }
+    throw new Error(`Workspace image not found. Either:\n` +
+        `  1. Run 'perry build' to build locally, or\n` +
+        `  2. Check your network connection to pull from registry`);
+}
 async function copyCredentialToContainer(options) {
     const { source, dest, containerName, dirPermissions = '700', filePermissions = '600', tempPrefix = 'ws-cred', } = options;
     const expandedSource = expandPath(source);
@@ -210,6 +226,13 @@ export class WorkspaceManager {
             tempPrefix: 'ws-gitconfig',
         });
     }
+    async setupWorkspaceCredentials(containerName) {
+        await this.copyGitConfig(containerName);
+        await this.copyCredentialFiles(containerName);
+        await this.setupClaudeCodeConfig(containerName);
+        await this.copyCodexCredentials(containerName);
+        await this.setupOpencodeConfig(containerName);
+    }
     async runPostStartScript(containerName) {
         const scriptPath = this.config.scripts.post_start;
         if (!scriptPath) {
@@ -287,10 +310,7 @@ export class WorkspaceManager {
         };
         await this.state.setWorkspace(workspace);
         try {
-            const imageReady = await docker.imageExists(WORKSPACE_IMAGE);
-            if (!imageReady) {
-                throw new Error(`Workspace image '${WORKSPACE_IMAGE}' not found. Run 'workspace build' first.`);
-            }
+            const workspaceImage = await ensureWorkspaceImage();
             if (!(await docker.volumeExists(volumeName))) {
                 await docker.createVolume(volumeName);
             }
@@ -310,7 +330,7 @@ export class WorkspaceManager {
             }
             const containerId = await docker.createContainer({
                 name: containerName,
-                image: WORKSPACE_IMAGE,
+                image: workspaceImage,
                 hostname: name,
                 privileged: true,
                 restartPolicy: 'unless-stopped',
@@ -326,11 +346,8 @@ export class WorkspaceManager {
             workspace.ports.ssh = sshPort;
             await this.state.setWorkspace(workspace);
             await docker.startContainer(containerName);
-            await this.copyGitConfig(containerName);
-            await this.copyCredentialFiles(containerName);
-            await this.setupClaudeCodeConfig(containerName);
-            await this.copyCodexCredentials(containerName);
-            await this.setupOpencodeConfig(containerName);
+            await docker.waitForContainerReady(containerName);
+            await this.setupWorkspaceCredentials(containerName);
             workspace.status = 'running';
             await this.state.setWorkspace(workspace);
             await this.runPostStartScript(containerName);
@@ -356,6 +373,7 @@ export class WorkspaceManager {
                 throw new Error(`Container and volume for workspace '${name}' were deleted. ` +
                     `Please delete this workspace and create a new one.`);
             }
+            const workspaceImage = await ensureWorkspaceImage();
             const sshPort = await findAvailablePort(SSH_PORT_RANGE_START, SSH_PORT_RANGE_END);
             const containerEnv = {
                 ...this.config.credentials.env,
@@ -371,7 +389,7 @@ export class WorkspaceManager {
             }
             const containerId = await docker.createContainer({
                 name: containerName,
-                image: WORKSPACE_IMAGE,
+                image: workspaceImage,
                 hostname: name,
                 privileged: true,
                 restartPolicy: 'unless-stopped',
@@ -394,11 +412,8 @@ export class WorkspaceManager {
             return workspace;
         }
         await docker.startContainer(containerName);
-        await this.copyGitConfig(containerName);
-        await this.copyCredentialFiles(containerName);
-        await this.setupClaudeCodeConfig(containerName);
-        await this.copyCodexCredentials(containerName);
-        await this.setupOpencodeConfig(containerName);
+        await docker.waitForContainerReady(containerName);
+        await this.setupWorkspaceCredentials(containerName);
         workspace.status = 'running';
         await this.state.setWorkspace(workspace);
         await this.runPostStartScript(containerName);
@@ -466,10 +481,6 @@ export class WorkspaceManager {
         if (!running) {
             throw new Error(`Workspace '${name}' is not running`);
         }
-        await this.copyGitConfig(containerName);
-        await this.copyCredentialFiles(containerName);
-        await this.setupClaudeCodeConfig(containerName);
-        await this.copyCodexCredentials(containerName);
-        await this.setupOpencodeConfig(containerName);
+        await this.setupWorkspaceCredentials(containerName);
     }
 }

package/dist/workspace/state.js

@@ -1,11 +1,40 @@
 import { promises as fs } from 'fs';
 import path from 'path';
+import lockfile from 'proper-lockfile';
 import { STATE_FILE } from '../shared/types';
 export class StateManager {
     statePath;
     state = null;
+    lockfilePath;
     constructor(configDir) {
         this.statePath = path.join(configDir, STATE_FILE);
+        this.lockfilePath = path.join(configDir, '.state.lock');
+    }
+    async ensureLockfile() {
+        try {
+            await fs.mkdir(path.dirname(this.lockfilePath), { recursive: true });
+            await fs.writeFile(this.lockfilePath, '', { flag: 'wx' });
+        }
+        catch (err) {
+            if (err.code !== 'EEXIST') {
+                throw err;
+            }
+        }
+    }
+    async withLock(fn) {
+        await this.ensureLockfile();
+        let release;
+        try {
+            release = await lockfile.lock(this.lockfilePath, {
+                retries: { retries: 5, minTimeout: 100, maxTimeout: 1000 },
+            });
+            return await fn();
+        }
+        finally {
+            if (release) {
+                await release();
+            }
+        }
     }
     async load() {
         if (this.state) {
@@ -29,8 +58,10 @@ export class StateManager {
         if (!this.state) {
             return;
         }
-        await fs.mkdir(path.dirname(this.statePath), { recursive: true });
-        await fs.writeFile(this.statePath, JSON.stringify(this.state, null, 2), 'utf-8');
+        await this.withLock(async () => {
+            await fs.mkdir(path.dirname(this.statePath), { recursive: true });
+            await fs.writeFile(this.statePath, JSON.stringify(this.state, null, 2), 'utf-8');
+        });
     }
     async getWorkspace(name) {
         const state = await this.load();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gricha/perry",
-  "version": "0.0.1",
+  "version": "0.1.0",
   "description": "Self-contained CLI for spinning up Docker-in-Docker development environments with SSH and proxy helpers.",
   "type": "module",
   "bin": {