@playcraft/cli 0.1.26 → 0.1.27

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

@@ -292,6 +292,42 @@ export async function saveWorkspaceGit(root, input) {
     await recordPushedHead(rootReal);
     return { ...(commit ? { commit } : {}), pushed: true, withheld };
 }
+/**
+ * Connects a standalone checkout to the repository it was just given, keeping all its history and
+ * uncommitted work. The new repository holds one empty commit on `branch`; it becomes the base of an
+ * unborn checkout, or is merged into existing history, so the next push is a plain fast-forward.
+ * Credentials come from the workspace's configured helper and never enter the remote URL.
+ * Safe to run again after a failure part way.
+ */
+export async function attachWorkspaceRemote(root, repositoryUrl, branch) {
+    const rootReal = await ensureWorkspaceGit(root);
+    const origin = await gitAllowFail(rootReal, ['remote', 'get-url', 'origin']);
+    if (origin.code !== 0)
+        await git(rootReal, ['remote', 'add', 'origin', repositoryUrl]);
+    else if (origin.stdout.trim() !== repositoryUrl)
+        throw new GitWorkspaceError('remote_not_configured', 'origin_mismatch');
+    const remoteRef = `refs/remotes/origin/${branch}`;
+    const fetched = await gitAllowFail(rootReal, ['fetch', '--no-tags', 'origin', `+refs/heads/${branch}:${remoteRef}`], 90000);
+    if (fetched.code !== 0)
+        throw new GitWorkspaceError(httpRefusal(fetched.stderr) ?? 'git_command_failed', 'git_fetch_failed');
+    const current = (await gitAllowFail(rootReal, ['symbolic-ref', '--quiet', '--short', 'HEAD'])).stdout.trim();
+    const born = (await gitAllowFail(rootReal, ['rev-parse', '-q', '--verify', 'HEAD^{commit}'])).code === 0;
+    if (current !== branch) {
+        await git(rootReal, born ? ['branch', '-M', branch] : ['symbolic-ref', 'HEAD', `refs/heads/${branch}`]);
+    }
+    if (!born) {
+        // Nothing committed yet: start the branch at the remote commit; the files stay as changes.
+        await git(rootReal, ['update-ref', `refs/heads/${branch}`, remoteRef]);
+    }
+    else if ((await gitAllowFail(rootReal, ['merge-base', '--is-ancestor', remoteRef, 'HEAD'])).code !== 0) {
+        const merged = await gitAllowFail(rootReal, [...(await commitIdentity(rootReal)), 'merge', '--allow-unrelated-histories', '--no-edit', remoteRef], 60000);
+        if (merged.code !== 0) {
+            await gitAllowFail(rootReal, ['merge', '--abort']);
+            throw new GitWorkspaceError('git_command_failed', merged.stderr.trim() || 'git_merge_failed');
+        }
+    }
+    await git(rootReal, ['branch', `--set-upstream-to=origin/${branch}`, branch]);
+}
 async function unstage(rootReal, paths) {
     if (paths.length === 0)
         return;

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

@@ -1,5 +1,5 @@
 import { execFile } from 'node:child_process';
-import { lstat, mkdir, realpath } from 'node:fs/promises';
+import { lstat, mkdir, realpath, rm, writeFile } from 'node:fs/promises';
 import { join, relative } from 'node:path';
 import { promisify } from 'node:util';
 import { isLocalWorkspaceGitAuthMode, sameWorkspaceRegistration, workspaceRegistrationSchema, } from '@playcraft/common/cloud-workspace/runtime';
@@ -9,6 +9,7 @@ import { scheduleDependencyInstall } from './dependencies.js';
 import { ensureWorkspaceSkills, readWorkspaceSkills } from './skills.js';
 import { loadWorkspaceSkillArtifact, workspacePlatformSkillAccess } from './skill-artifact-loader.js';
 import { writeWorkspaceCliContext } from './cli-context.js';
+import { attachWorkspaceRemote } from './git.js';
 export { WorkspaceContextError } from './context-error.js';
 const exec = promisify(execFile);
 export function revisionScope(state, workspaceId, directoryName = 'basic') {
@@ -106,8 +107,11 @@ export async function registerWorkspace(state, input, leaseFence, preparation, r
         const existing = state.journal.getWorkspace(binding.workspaceId);
         const preservedLocalBasic = binding.targetKind !== 'standalone' && binding.preserveLocalBasic === true;
         const localUpgrade = preservedLocalBasic && binding.targetKind === 'main' && existing?.targetKind === 'standalone';
-        if (existing && !sameWorkspaceRegistration(existing, binding) && !localUpgrade)
+        // A standalone workspace promoted to a project's main keeps its checkout and gains that remote.
+        const remoteUpgrade = !preservedLocalBasic && binding.targetKind === 'main' && existing?.targetKind === 'standalone';
+        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;
         if (directories?.some(directory => directory.directoryName === 'basic' && directory.status === 'reclaimed')) {
             // Registration publishes trusted identity. Only an explicit basic ensure restores the checkout.
@@ -142,6 +146,28 @@ export async function registerWorkspace(state, input, leaseFence, preparation, r
                 GIT_CONFIG_GLOBAL: '/dev/null',
             },
         })).stdout.trim();
+        // Unfinished if it failed part way: the marker outlives the journal entry written below.
+        if (binding.targetKind === 'main' && !preservedLocalBasic && (remoteUpgrade || await lstat(attachMarker).then(() => true, () => false))) {
+            if (preparation?.mode !== 'clone' || !state.gitCredentials)
+                throw new WorkspaceContextError('workspace_git_gateway_unavailable');
+            await mkdir(join(state.config.stateDir, 'workspace-remote-attach'), { recursive: true, mode: 0o700 });
+            await writeFile(attachMarker, JSON.stringify({ repositoryUrl: binding.repositoryUrl, branchName: binding.branchName }), { mode: 0o600 });
+            // The credential helper only serves a workspace the journal knows to be bound.
+            await state.journal.putWorkspace({ ...binding, directories });
+            try {
+                await state.gitCredentials.configure(binding, preparation);
+            }
+            catch {
+                throw new WorkspaceContextError('workspace_git_gateway_unavailable');
+            }
+            try {
+                await attachWorkspaceRemote(root, binding.repositoryUrl, binding.branchName);
+            }
+            catch {
+                throw new WorkspaceContextError('workspace_remote_attach_failed');
+            }
+            await rm(attachMarker, { force: true });
+        }
         try {
             let checkoutMatches;
             if (binding.targetKind === 'standalone' || preservedLocalBasic) {

package/package.json

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