@gricha/perry 0.3.15 → 0.3.17

package/dist/agent/router.js

@@ -260,6 +260,58 @@ export function createRouter(ctx) {
             mapErrorToORPC(err, 'Failed to clone workspace');
         }
     });
+    const execInWorkspace = os
+        .input(z.object({
+        name: z.string(),
+        command: z.union([z.string(), z.array(z.string())]),
+        timeout: z.number().optional(),
+    }))
+        .output(z.object({
+        stdout: z.string(),
+        stderr: z.string(),
+        exitCode: z.number(),
+    }))
+        .handler(async ({ input }) => {
+        const workspace = await ctx.workspaces.get(input.name);
+        if (!workspace) {
+            throw new ORPCError('NOT_FOUND', { message: 'Workspace not found' });
+        }
+        if (workspace.status !== 'running') {
+            throw new ORPCError('PRECONDITION_FAILED', { message: 'Workspace is not running' });
+        }
+        const containerName = getContainerName(input.name);
+        const commandArray = Array.isArray(input.command)
+            ? input.command
+            : ['/bin/sh', '-c', input.command];
+        try {
+            const execPromise = execInContainer(containerName, commandArray, { user: 'workspace' });
+            let result;
+            if (input.timeout) {
+                const timeoutPromise = new Promise((_, reject) => {
+                    setTimeout(() => {
+                        reject(new Error(`Command execution timed out after ${input.timeout}ms`));
+                    }, input.timeout);
+                });
+                result = await Promise.race([execPromise, timeoutPromise]);
+            }
+            else {
+                result = await execPromise;
+            }
+            return {
+                stdout: result.stdout,
+                stderr: result.stderr,
+                exitCode: result.exitCode,
+            };
+        }
+        catch (err) {
+            if (err instanceof Error && err.message.includes('timed out')) {
+                throw new ORPCError('TIMEOUT', { message: err.message });
+            }
+            throw new ORPCError('INTERNAL_SERVER_ERROR', {
+                message: `Failed to execute command: ${err.message}`,
+            });
+        }
+    });
     const getInfo = os.handler(async () => {
         let dockerVersion = 'unknown';
         try {
@@ -1125,6 +1177,7 @@ export function createRouter(ctx) {
             getPortForwards: getPortForwards,
             setPortForwards: setPortForwards,
             updateWorker: updateWorker,
+            exec: execInWorkspace,
         },
         sessions: {
             list: listSessions,

package/dist/workspace/manager.js

@@ -137,6 +137,37 @@ export class WorkspaceManager {
             tempPrefix: 'ws-gitconfig',
         });
     }
+    async syncEnvironmentFile(containerName) {
+        const env = {
+            ...this.config.credentials.env,
+        };
+        if (this.config.agents?.github?.token) {
+            env.GITHUB_TOKEN = this.config.agents.github.token;
+        }
+        if (this.config.agents?.claude_code?.oauth_token) {
+            env.CLAUDE_CODE_OAUTH_TOKEN = this.config.agents.claude_code.oauth_token;
+        }
+        if (Object.keys(env).length === 0) {
+            return;
+        }
+        const lines = Object.entries(env)
+            .map(([key, value]) => {
+            const escaped = value.includes(' ') || value.includes('"') || value.includes("'")
+                ? `"${value.replace(/\\/g, '\\\\').replace(/"/g, '\\"')}"`
+                : value;
+            return `${key}=${escaped}`;
+        })
+            .sort();
+        const content = lines.join('\n') + '\n';
+        const tempFile = path.join(os.tmpdir(), `ws-env-${Date.now()}`);
+        try {
+            await fs.writeFile(tempFile, content);
+            await docker.copyToContainer(containerName, tempFile, '/etc/environment');
+        }
+        finally {
+            await fs.unlink(tempFile).catch(() => { });
+        }
+    }
     async setupSSHKeys(containerName, workspaceName) {
         if (!this.config.ssh) {
             return;
@@ -189,6 +220,7 @@ export class WorkspaceManager {
     async setupWorkspaceCredentials(containerName, workspaceName) {
         await this.copyGitConfig(containerName);
         await this.copyCredentialFiles(containerName);
+        await this.syncEnvironmentFile(containerName);
         await syncAllAgents(containerName, this.config);
         await this.copyPerryWorker(containerName);
         await this.startWorkerServer(containerName);

package/package.json

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