@playcraft/cli 0.1.33 → 0.1.34

package/dist/workspace-runtime/server/dispatch.js

@@ -1,6 +1,7 @@
 import { withObservedFile } from '../workspaces/revisions.js';
 import { revisionScope, sessionWorkspaceRoot, workspaceRoot, workspaceSessions } from '../workspaces/registry.js';
 import { abandonTurnChanges, beginTurnChanges, finishTurnChanges } from '../workspaces/turn-changes.js';
+import { shareWorkspaceGit } from '../workspaces/shared-git.js';
 import { join } from 'node:path';
 import { z } from 'zod';
 import { PLATFORM_ROUTES, platformEndpoint, fileWritePayloadSchema, gitCommitPayloadSchema, gitPathsPayloadSchema, gitPushPayloadSchema, gitPullPayloadSchema, gitMergeAbortPayloadSchema, parameterPatchPayloadSchema, productionSessionAttemptId, reasoningEffortSchema, workspacePermissionModeSchema, workspaceComposerSelectionSchema, workspaceReviewPayloadSchema, workspaceCompactPayloadSchema, workspaceSteerPayloadSchema, workspaceApprovalResponseSchema, terminalCreatePayloadSchema, terminalProcessIdentity, transitionOperation, recoverUncertainOperation, workspaceSavePayloadSchema, workspaceSkillsUpdatePayloadSchema, } from '@playcraft/common/cloud-workspace/runtime';
@@ -789,7 +790,7 @@ async function executeGitCommit(state, scopeKey, operation, payload) {
         return persist(state, scopeKey, transitionOperation(operation, 'failed', { error: 'invalid_git_commit' }));
     }
     try {
-        const sha = await commitWorkspaceGit(await workspaceRoot(state, operation.workspaceId, operation.directoryName), parsed.data, boundBranch(state, operation));
+        const sha = await commitWorkspaceGit(await gitWorkspaceRoot(state, operation), parsed.data, boundBranch(state, operation));
         const accepted = await persist(state, scopeKey, transitionOperation(operation, 'accepted'));
         await recordNativeEvents(state, accepted, [
             {
@@ -826,7 +827,7 @@ async function executeWorkspaceSave(state, scopeKey, operation, payload) {
     }
     const binding = operation.workspaceId ? state.journal.getWorkspace(operation.workspaceId) : undefined;
     try {
-        const saved = await saveWorkspaceGit(await workspaceRoot(state, operation.workspaceId, operation.directoryName), {
+        const saved = await saveWorkspaceGit(await gitWorkspaceRoot(state, operation), {
             message: parsed.data.trigger === 'auto' ? 'Autosave workspace' : 'Save workspace',
             push: savePushesBranch(binding?.targetKind, operation.directoryName),
             boundBranch: boundBranch(state, operation),
@@ -851,7 +852,7 @@ async function executeGitPush(state, scopeKey, operation, payload) {
         return persist(state, scopeKey, transitionOperation(operation, 'failed', { error: 'remote_not_configurable' }));
     }
     try {
-        await pushWorkspaceGit(await workspaceRoot(state, operation.workspaceId, operation.directoryName), boundBranch(state, operation));
+        await pushWorkspaceGit(await gitWorkspaceRoot(state, operation), boundBranch(state, operation));
         const accepted = await persist(state, scopeKey, transitionOperation(operation, 'accepted'));
         await recordNativeEvents(state, accepted, [
             {
@@ -872,7 +873,7 @@ async function executeGitPull(state, scopeKey, operation, payload) {
         return persist(state, scopeKey, transitionOperation(operation, 'failed', { error: 'remote_not_configurable' }));
     }
     try {
-        const pulled = await pullWorkspaceGit(await workspaceRoot(state, operation.workspaceId, operation.directoryName), boundBranch(state, operation));
+        const pulled = await pullWorkspaceGit(await gitWorkspaceRoot(state, operation), boundBranch(state, operation));
         const accepted = await persist(state, scopeKey, transitionOperation(operation, 'accepted'));
         await recordNativeEvents(state, accepted, [{
                 type: 'git.pulled',
@@ -890,7 +891,7 @@ async function executeGitMergeAbort(state, scopeKey, operation, payload) {
         return persist(state, scopeKey, transitionOperation(operation, 'failed', { error: 'invalid_git_merge_abort' }));
     }
     try {
-        await abortWorkspaceMerge(await workspaceRoot(state, operation.workspaceId, operation.directoryName));
+        await abortWorkspaceMerge(await gitWorkspaceRoot(state, operation));
         const accepted = await persist(state, scopeKey, transitionOperation(operation, 'accepted'));
         await recordNativeEvents(state, accepted, [{ type: 'git.merge.aborted', payload: {}, occurredAt: new Date().toISOString() }]);
         return persist(state, scopeKey, transitionOperation(accepted, 'completed'));
@@ -912,7 +913,7 @@ async function executeGitIndex(state, scopeKey, operation, payload) {
         return persist(state, scopeKey, transitionOperation(operation, 'failed', { error: 'invalid_git_paths' }));
     }
     try {
-        await change.run(await workspaceRoot(state, operation.workspaceId, operation.directoryName), parsed.data);
+        await change.run(await gitWorkspaceRoot(state, operation), parsed.data);
         const accepted = await persist(state, scopeKey, transitionOperation(operation, 'accepted'));
         await recordNativeEvents(state, accepted, [
             { type: change.event, payload: { paths: parsed.data.paths }, occurredAt: new Date().toISOString() },
@@ -1043,8 +1044,16 @@ function boundBranch(state, operation) {
         : binding.branchName ?? undefined;
 }
 function gitErrorCode(error) {
+    // The code is all an operation records; Git's own message stays in the runtime log.
+    console.warn('[workspace-runtime] git operation failed:', error instanceof Error ? error.message : error);
     return error instanceof GitWorkspaceError ? error.code : 'git_command_failed';
 }
+/** The workspace checkout, prepared so this process and the development user can both write it. */
+async function gitWorkspaceRoot(state, operation) {
+    const root = await workspaceRoot(state, operation.workspaceId, operation.directoryName);
+    await shareWorkspaceGit(state, root);
+    return root;
+}
 function parameterPatchError(error) {
     if (error instanceof ParameterEditError)
         return error.code;

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

@@ -515,6 +515,18 @@ export async function ensureWorkspaceGit(root) {
     await excludeFromGit(rootReal, '/.tmp/user_uploads/');
     return rootReal;
 }
+/**
+ * The control user and the development user (terminal, Codex) both write this repository. Git
+ * creates directories with the writer's umask, so a directory one user made can refuse the
+ * other's objects. With `core.sharedRepository=group` Git makes new directories group-writable for
+ * both; the image puts the control user in the development group.
+ */
+export async function shareWorkspaceRepository(root) {
+    const rootReal = await existingWorkspaceGit(root);
+    const current = await gitAllowFail(rootReal, ['config', '--get', 'core.sharedRepository']);
+    if (current.stdout.trim() !== 'group')
+        await git(rootReal, ['config', 'core.sharedRepository', 'group']);
+}
 /** Turn snapshots never create a repository; a directory without one simply has no turn changes. */
 async function existingWorkspaceGit(root) {
     const rootReal = await realpath(root);

package/dist/workspace-runtime/workspaces/shared-git.js

@@ -0,0 +1,40 @@
+import { lstat, readdir } from 'node:fs/promises';
+import { join } from 'node:path';
+import { launcherSocket, runDeveloperCommand } from './developer-command.js';
+import { shareWorkspaceRepository } from './git.js';
+/**
+ * Directories under `.git` this process cannot write: another user created them without group
+ * write. Only their owner can change that, so they are reported rather than fixed here.
+ */
+export async function foreignUnwritableGitDirectories(root) {
+    const uid = typeof process.getuid === 'function' ? process.getuid() : undefined;
+    const found = [];
+    const visit = async (path) => {
+        const stat = await lstat(path).catch(() => undefined);
+        if (!stat?.isDirectory())
+            return;
+        if (stat.uid !== uid && (stat.mode & 0o020) === 0)
+            found.push(path);
+        for (const entry of await readdir(path).catch(() => []))
+            await visit(join(path, entry));
+    };
+    await visit(join(root, '.git'));
+    return found;
+}
+/**
+ * Prepares a workspace repository for a Git write by this process: new directories become group
+ * writable, and directories the development user already made without group write are opened by
+ * that user through the launcher. Without a launcher (local runs) both users are the same.
+ */
+export async function shareWorkspaceGit(state, root) {
+    await shareWorkspaceRepository(root).catch(() => undefined);
+    if (!launcherSocket(state) || !(await foreignUnwritableGitDirectories(root)).length)
+        return;
+    await runDeveloperCommand(state, {
+        processId: `git-share-${Date.now().toString(36)}`,
+        cwd: root,
+        command: 'find .git -type d -uid "$(id -u)" ! -perm -g+w -exec chmod g+ws {} +',
+        timeoutMs: 30_000,
+        onOutput: () => undefined,
+    }).catch(() => undefined);
+}

package/dist/workspace-runtime/workspaces/turn-changes.js

@@ -1,5 +1,6 @@
 import { TURN_FILES_CHANGED_EVENT, } from '@playcraft/common/cloud-workspace/runtime';
 import { diffWorkspaceTrees, retainTurnSnapshots, snapshotWorkspaceTree } from './git.js';
+import { shareWorkspaceGit } from './shared-git.js';
 const TURN_ENDS = new Set(['turn/completed', 'turn.completed', 'turn.interrupted', 'turn.failed']);
 /**
  * Snapshots taken when a session's turn starts, until that turn ends. Kept in memory only: a
@@ -20,6 +21,7 @@ export async function beginTurnChanges(state, sessionId, input) {
     turnsOf(state).delete(sessionId);
     if (input.directoryName === 'root')
         return;
+    await shareWorkspaceGit(state, input.root).catch(() => undefined);
     const before = await snapshotWorkspaceTree(input.root).catch(() => undefined);
     if (before)
         turnsOf(state).set(sessionId, { ...input, before });
@@ -42,6 +44,7 @@ export async function finishTurnChanges(state, event) {
         return [];
     turnsOf(state).delete(session.sessionId);
     try {
+        await shareWorkspaceGit(state, start.root);
         const after = await snapshotWorkspaceTree(start.root);
         const { files, truncated } = await diffWorkspaceTrees(start.root, start.before, after);
         if (!files.length)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@playcraft/cli",
-  "version": "0.1.33",
+  "version": "0.1.34",
   "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.33",
-    "@playcraft/common": "^0.1.33",
+    "@playcraft/build": "^0.1.34",
+    "@playcraft/common": "^0.1.34",
     "better-sqlite3-pinned": "npm:better-sqlite3@13.0.3",
     "chokidar": "^4.0.3",
     "commander": "^13.1.0",