@playcraft/cli 0.1.30 → 0.1.31

package/dist/workspace-runtime/production/native.js

@@ -157,11 +157,18 @@ export async function runProductionNative(state, input, root, record, track) {
             completion(completedTurn.status === 'completed' ? 'completed' : 'failed');
         timeout = setTimeout(() => completion('unknown'), 30 * 60_000);
         let checking = false;
+        let consecutiveLeaseFailures = 0;
         leaseCheck = setInterval(() => {
             if (checking)
                 return;
             checking = true;
-            void verifyProductionLease(input).catch(async () => { completion('unknown'); await adapter.close?.().catch(() => undefined); }).finally(() => { checking = false; });
+            void verifyProductionLease(input).then(() => { consecutiveLeaseFailures = 0; }).catch(async () => {
+                consecutiveLeaseFailures += 1;
+                if (consecutiveLeaseFailures >= 2) {
+                    completion('unknown');
+                    await adapter.close?.().catch(() => undefined);
+                }
+            }).finally(() => { checking = false; });
         }, 5000);
         const status = await done;
         if (status !== 'completed')

package/dist/workspace-runtime/production/stages.js

@@ -66,9 +66,11 @@ export async function executeProductionStage(state, input, processRecord, track)
             await ensureWorkspaceSkills(destination, join(state.config.stateDir, 'skill-artifacts'));
             await openDirectoryToDevelopment(destination, developmentGroup);
             await grantWorkspaceTraversal(container, developmentGroup);
-            const binding = state.journal.getWorkspace(workspaceId);
-            await state.journal.putWorkspace({ ...binding, directories: [...(binding.directories ?? []).filter(value => value.directoryName !== input.directoryName),
-                    { workspaceId, directoryName: input.directoryName, remixId, branchName, sourceCommit: snapshot.commitHash, status: 'ready' }] });
+            await state.journal.exclusive(`workspace:${workspaceId}`, async () => {
+                const binding = state.journal.getWorkspace(workspaceId);
+                await state.journal.putWorkspace({ ...binding, directories: [...(binding.directories ?? []).filter(value => value.directoryName !== input.directoryName),
+                        { workspaceId, directoryName: input.directoryName, remixId, branchName, sourceCommit: snapshot.commitHash, status: 'ready' }] });
+            });
             return { sourceSnapshot: snapshot, commitHash: snapshot.commitHash };
         });
     }
@@ -109,6 +111,7 @@ export async function executeProductionStage(state, input, processRecord, track)
         const branch = input.directoryName === 'basic' ? binding.branchName : binding.directories?.find(value => value.directoryName === input.directoryName)?.branchName;
         if ((input.git && input.git.branchName !== branch) || await git(root, 'symbolic-ref', '--short', 'HEAD') !== branch)
             throw new Error('production_git_binding_mismatch');
+        await run(root, 'chmod -R u+rwX,g+rwX .').catch(() => undefined);
         await excludeFromGit(root);
         await excludeFromGit(root, '/.env*');
         await excludeFromGit(root, '/.playcraft-temp/');

package/dist/workspace-runtime/workspaces/directories.js

@@ -69,11 +69,14 @@ export async function registerWorkspaceDirectory(state, input, leaseFence, sourc
             }
         }
         await openDirectoryToDevelopment(root, (await lstat(state.config.workspaceRoot)).gid);
-        state.acceptedLeaseFence = Math.max(state.acceptedLeaseFence, leaseFence);
-        await state.journal.setAcceptedLeaseFence(state.acceptedLeaseFence);
-        await state.journal.putWorkspace({ ...binding, directories: [...(binding.directories ?? []).filter(item => item.directoryName !== directory.directoryName), { ...directory, status: 'ready' }] });
+        await state.journal.exclusive(`workspace:${directory.workspaceId}`, async () => {
+            state.acceptedLeaseFence = Math.max(state.acceptedLeaseFence, leaseFence);
+            await state.journal.setAcceptedLeaseFence(state.acceptedLeaseFence);
+            const latest = state.journal.getWorkspace(directory.workspaceId) ?? binding;
+            await state.journal.putWorkspace({ ...latest, directories: [...(latest.directories ?? []).filter(item => item.directoryName !== directory.directoryName), { ...directory, status: 'ready' }] });
+        });
         if (state.gitCredentials)
-            await state.gitCredentials.configure(binding, await state.gitCredentials.prepareDirectory(directory.workspaceId, directory.directoryName), directory.directoryName);
+            await state.gitCredentials.configure(state.journal.getWorkspace(directory.workspaceId) ?? binding, await state.gitCredentials.prepareDirectory(directory.workspaceId, directory.directoryName), directory.directoryName);
         return directory;
     });
 }

package/dist/workspace-runtime/workspaces/directory-access.js

@@ -11,18 +11,26 @@ export async function grantWorkspaceTraversal(root, groupId) {
 }
 /** The sandbox development group can edit engine directories. Symlinks never grant access outside the tree. */
 export async function openDirectoryToDevelopment(root, groupId) {
+    const currentUid = typeof process.getuid === 'function' ? process.getuid() : undefined;
     const visit = async (path) => {
         const stat = await lstat(path);
         if (stat.isSymbolicLink())
             return;
-        if (stat.gid !== groupId)
+        const canModify = currentUid === undefined || currentUid === 0 || stat.uid === currentUid;
+        if (canModify && stat.gid !== groupId)
             await chown(path, stat.uid, groupId);
         if (stat.isDirectory()) {
-            await chmod(path, (stat.mode & 0o777) | 0o2770);
-            for (const entry of await readdir(path))
+            if (canModify)
+                await chmod(path, (stat.mode & 0o777) | 0o2770);
+            const entries = await readdir(path).catch(error => {
+                if (!canModify && error.code === 'EACCES')
+                    return [];
+                throw error;
+            });
+            for (const entry of entries)
                 await visit(join(path, entry));
         }
-        else if (stat.isFile())
+        else if (stat.isFile() && canModify)
             await chmod(path, (stat.mode & 0o777) | 0o660);
     };
     await visit(root);

package/dist/workspace-runtime/workspaces/registry.js

@@ -112,7 +112,15 @@ export async function registerWorkspace(state, input, leaseFence, preparation, r
         if (existing && !sameWorkspaceRegistration(existing, binding) && !localUpgrade && !remoteUpgrade)
             throw new WorkspaceContextError('workspace_binding_conflict');
         const attachMarker = join(state.config.stateDir, 'workspace-remote-attach', `${binding.workspaceId}.json`);
-        const directories = binding.directories ?? existing?.directories;
+        const existingByDir = new Map((existing?.directories ?? []).map(item => [item.directoryName, item]));
+        const directories = binding.directories
+            ? binding.directories.map(item => {
+                const local = existingByDir.get(item.directoryName);
+                return local && local.remixId === item.remixId && local.status === 'ready' && item.status === 'pending'
+                    ? { ...item, status: 'ready', sourceCommit: item.sourceCommit ?? local.sourceCommit }
+                    : item;
+            })
+            : existing?.directories;
         if (directories?.some(directory => directory.directoryName === 'basic' && directory.status === 'reclaimed')) {
             // Registration publishes trusted identity. Only an explicit basic ensure restores the checkout.
             const parent = await realpath(state.config.workspaceRoot);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@playcraft/cli",
-  "version": "0.1.30",
+  "version": "0.1.31",
   "private": false,
   "type": "module",
   "engines": {
@@ -50,8 +50,8 @@
     "@gltf-transform/core": "^4.3.0",
     "@gltf-transform/extensions": "^4.3.0",
     "@gltf-transform/functions": "^4.3.0",
-    "@playcraft/build": "^0.1.30",
-    "@playcraft/common": "^0.1.30",
+    "@playcraft/build": "^0.1.31",
+    "@playcraft/common": "^0.1.31",
     "better-sqlite3-pinned": "npm:better-sqlite3@13.0.3",
     "chokidar": "^4.0.3",
     "commander": "^13.1.0",