@gricha/perry 0.1.5 → 0.1.7

package/dist/workspace/manager.js

@@ -8,6 +8,7 @@ import { expandPath } from '../config/loader';
 import * as docker from '../docker';
 import { getContainerName } from '../docker';
 import { VOLUME_PREFIX, WORKSPACE_IMAGE_LOCAL, WORKSPACE_IMAGE_REGISTRY, SSH_PORT_RANGE_START, SSH_PORT_RANGE_END, } from '../shared/constants';
+import { collectAuthorizedKeys, collectCopyKeys } from '../ssh/sync';
 async function findAvailablePort(start, end) {
     for (let port = start; port <= end; port++) {
         const available = await new Promise((resolve) => {
@@ -226,12 +227,64 @@ export class WorkspaceManager {
             tempPrefix: 'ws-gitconfig',
         });
     }
-    async setupWorkspaceCredentials(containerName) {
+    async setupSSHKeys(containerName, workspaceName) {
+        if (!this.config.ssh) {
+            return;
+        }
+        await docker.execInContainer(containerName, ['mkdir', '-p', '/home/workspace/.ssh'], {
+            user: 'workspace',
+        });
+        await docker.execInContainer(containerName, ['chmod', '700', '/home/workspace/.ssh'], {
+            user: 'workspace',
+        });
+        const authorizedKeys = await collectAuthorizedKeys(this.config.ssh, workspaceName);
+        if (authorizedKeys.length > 0) {
+            const content = authorizedKeys.join('\n') + '\n';
+            const tempFile = path.join(os.tmpdir(), `ws-authkeys-${Date.now()}`);
+            try {
+                await fs.writeFile(tempFile, content);
+                await docker.copyToContainer(containerName, tempFile, '/home/workspace/.ssh/authorized_keys');
+                await docker.execInContainer(containerName, ['chown', 'workspace:workspace', '/home/workspace/.ssh/authorized_keys'], { user: 'root' });
+                await docker.execInContainer(containerName, ['chmod', '600', '/home/workspace/.ssh/authorized_keys'], { user: 'workspace' });
+            }
+            finally {
+                await fs.unlink(tempFile).catch(() => { });
+            }
+        }
+        const copyKeys = await collectCopyKeys(this.config.ssh, workspaceName);
+        for (const key of copyKeys) {
+            const privateKeyPath = `/home/workspace/.ssh/${key.name}`;
+            const publicKeyPath = `/home/workspace/.ssh/${key.name}.pub`;
+            const privateTempFile = path.join(os.tmpdir(), `ws-privkey-${Date.now()}`);
+            const publicTempFile = path.join(os.tmpdir(), `ws-pubkey-${Date.now()}`);
+            try {
+                await fs.writeFile(privateTempFile, key.privateKey + '\n');
+                await fs.writeFile(publicTempFile, key.publicKey + '\n');
+                await docker.copyToContainer(containerName, privateTempFile, privateKeyPath);
+                await docker.copyToContainer(containerName, publicTempFile, publicKeyPath);
+                await docker.execInContainer(containerName, ['chown', 'workspace:workspace', privateKeyPath, publicKeyPath], { user: 'root' });
+                await docker.execInContainer(containerName, ['chmod', '600', privateKeyPath], {
+                    user: 'workspace',
+                });
+                await docker.execInContainer(containerName, ['chmod', '644', publicKeyPath], {
+                    user: 'workspace',
+                });
+            }
+            finally {
+                await fs.unlink(privateTempFile).catch(() => { });
+                await fs.unlink(publicTempFile).catch(() => { });
+            }
+        }
+    }
+    async setupWorkspaceCredentials(containerName, workspaceName) {
         await this.copyGitConfig(containerName);
         await this.copyCredentialFiles(containerName);
         await this.setupClaudeCodeConfig(containerName);
         await this.copyCodexCredentials(containerName);
         await this.setupOpencodeConfig(containerName);
+        if (workspaceName) {
+            await this.setupSSHKeys(containerName, workspaceName);
+        }
     }
     async runPostStartScript(containerName) {
         const scriptPath = this.config.scripts.post_start;
@@ -290,6 +343,9 @@ export class WorkspaceManager {
         await this.syncWorkspaceStatus(workspace);
         return workspace;
     }
+    async touch(name) {
+        return this.state.touchWorkspace(name);
+    }
     async create(options) {
         const { name, clone, env } = options;
         const containerName = getContainerName(name);
@@ -307,6 +363,7 @@ export class WorkspaceManager {
             ports: {
                 ssh: 0,
             },
+            lastUsed: new Date().toISOString(),
         };
         await this.state.setWorkspace(workspace);
         try {
@@ -347,7 +404,7 @@ export class WorkspaceManager {
             await this.state.setWorkspace(workspace);
             await docker.startContainer(containerName);
             await docker.waitForContainerReady(containerName);
-            await this.setupWorkspaceCredentials(containerName);
+            await this.setupWorkspaceCredentials(containerName, name);
             workspace.status = 'running';
             await this.state.setWorkspace(workspace);
             await this.runPostStartScript(containerName);
@@ -408,13 +465,15 @@ export class WorkspaceManager {
         const running = await docker.containerRunning(containerName);
         if (running) {
             workspace.status = 'running';
+            workspace.lastUsed = new Date().toISOString();
             await this.state.setWorkspace(workspace);
             return workspace;
         }
         await docker.startContainer(containerName);
         await docker.waitForContainerReady(containerName);
-        await this.setupWorkspaceCredentials(containerName);
+        await this.setupWorkspaceCredentials(containerName, name);
         workspace.status = 'running';
+        workspace.lastUsed = new Date().toISOString();
         await this.state.setWorkspace(workspace);
         await this.runPostStartScript(containerName);
         return workspace;
@@ -481,6 +540,6 @@ export class WorkspaceManager {
         if (!running) {
             throw new Error(`Workspace '${name}' is not running`);
         }
-        await this.setupWorkspaceCredentials(containerName);
+        await this.setupWorkspaceCredentials(containerName, name);
     }
 }

package/dist/workspace/state.js

@@ -94,4 +94,13 @@ export class StateManager {
         await this.setWorkspace(workspace);
         return workspace;
     }
+    async touchWorkspace(name) {
+        const workspace = await this.getWorkspace(name);
+        if (!workspace) {
+            return null;
+        }
+        workspace.lastUsed = new Date().toISOString();
+        await this.setWorkspace(workspace);
+        return workspace;
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gricha/perry",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "Self-contained CLI for spinning up Docker-in-Docker development environments with SSH and proxy helpers.",
   "type": "module",
   "bin": {
@@ -22,7 +22,8 @@
     "format": "oxfmt --write src/ test/",
     "format:check": "oxfmt --check src/ test/",
     "check": "bun run lint && bun run format:check && bun x tsc --noEmit",
-    "validate": "bun run check && bun run build && bun run test"
+    "lint:web": "cd web && bun run lint",
+    "validate": "bun run check && bun run build && bun run test && bun run lint:web && bun run test:web"
   },
   "engines": {
     "bun": ">=1.3.5"