@playcraft/cli 0.1.7 → 0.1.8

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

@@ -596,7 +596,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), parsed.data);
+        const sha = await commitWorkspaceGit(await workspaceRoot(state, operation.workspaceId), parsed.data, boundBranch(state, operation));
         const accepted = await persist(state, scopeKey, transitionOperation(operation, 'accepted'));
         await recordNativeEvents(state, accepted, [
             {
@@ -617,7 +617,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));
+        await pushWorkspaceGit(await workspaceRoot(state, operation.workspaceId), boundBranch(state, operation));
         const accepted = await persist(state, scopeKey, transitionOperation(operation, 'accepted'));
         await recordNativeEvents(state, accepted, [
             {
@@ -765,6 +765,10 @@ async function executeTerminalCreate(state, scopeKey, operation, payload) {
     ]);
     return persist(state, scopeKey, transitionOperation(accepted, 'completed', { terminalId, cwd: record.cwd }));
 }
+/** The branch a registered workspace is bound to; the single-workspace mode has none. */
+function boundBranch(state, operation) {
+    return operation.workspaceId ? state.journal.getWorkspace(operation.workspaceId)?.branchName : undefined;
+}
 function gitErrorCode(error) {
     return error instanceof GitWorkspaceError ? error.code : 'git_command_failed';
 }

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

@@ -171,8 +171,34 @@ function splitLogLine(line) {
         return [line.slice(0, first), line.slice(first + 1), ''];
     return [line.slice(0, first), line.slice(first + 1, second), line.slice(second + 1)];
 }
-export async function commitWorkspaceGit(root, payload) {
+/**
+ * Commit and push stay on the branch the workspace is bound to. A switch made in a shell or by an
+ * agent is reported, never followed, so work cannot land on another Remix.
+ */
+async function assertBoundBranch(rootReal, boundBranch) {
+    if (!boundBranch)
+        return;
+    const current = await gitAllowFail(rootReal, ['symbolic-ref', '--quiet', '--short', 'HEAD']);
+    const branch = current.code === 0 ? current.stdout.trim() : '';
+    if (branch !== boundBranch) {
+        throw new GitWorkspaceError('workspace_branch_mismatch', branch || 'detached HEAD');
+    }
+}
+/**
+ * A push the remote refused for this ref is a definite outcome, unlike a lost response. Porcelain
+ * output marks the ref with "!" and says whether the remote has commits this checkout lacks.
+ */
+function pushRejection(stdout) {
+    const line = stdout.split('\n').find((item) => item.startsWith('!\t'));
+    if (!line)
+        return undefined;
+    if (/\[rejected\] \((?:non-fast-forward|fetch first)\)/.test(line))
+        return 'git_push_remote_ahead';
+    return 'git_push_rejected';
+}
+export async function commitWorkspaceGit(root, payload, boundBranch) {
     const rootReal = await ensureWorkspaceGit(root);
+    await assertBoundBranch(rootReal, boundBranch);
     if (payload.stagedOnly) {
         // The index is the commit; nothing is added.
     }
@@ -190,8 +216,9 @@ export async function commitWorkspaceGit(root, payload) {
     await git(rootReal, ['commit', '-m', payload.message], 20000);
     return (await git(rootReal, ['rev-parse', 'HEAD'])).trim();
 }
-export async function pushWorkspaceGit(root) {
+export async function pushWorkspaceGit(root, boundBranch) {
     const rootReal = await ensureWorkspaceGit(root);
+    await assertBoundBranch(rootReal, boundBranch);
     const origin = await gitAllowFail(rootReal, ['remote', 'get-url', 'origin']);
     if (origin.code !== 0) {
         throw new GitWorkspaceError('remote_not_configured', 'origin');
@@ -200,12 +227,16 @@ export async function pushWorkspaceGit(root) {
     if (!ref.startsWith('refs/heads/'))
         throw new GitWorkspaceError('git_command_failed', 'git_branch_required');
     const commit = (await git(rootReal, ['rev-parse', '--verify', 'HEAD^{commit}'])).trim();
+    let pushed;
     try {
-        const pushed = await gitAllowFail(rootReal, ['push', '--porcelain', 'origin', `${commit}:${ref}`], 90000);
-        if (pushed.code === 0)
-            return;
+        pushed = await gitAllowFail(rootReal, ['push', '--porcelain', 'origin', `${commit}:${ref}`], 90000);
     }
     catch { /* A lost response does not prove the remote rejected the update. */ }
+    if (pushed?.code === 0)
+        return;
+    const rejected = pushed ? pushRejection(pushed.stdout) : undefined;
+    if (rejected)
+        throw new GitWorkspaceError(rejected, rejected);
     try {
         const remote = await gitAllowFail(rootReal, ['ls-remote', '--refs', 'origin', ref], 20000);
         if (remote.code === 0 && remote.stdout.trim() === `${commit}\t${ref}`)

package/package.json

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