engineering-memory 1.11.9 → 1.11.11

package/runtime/dist/src/project/repository.js

@@ -10,7 +10,17 @@ export class RepositoryResolver {
         this.markerSchemaVersion = markerSchemaVersion;
         this.stateRoot = stateRoot;
     }
+    async resolveIdentity(startPath, explicitProjectId) {
+        const bound = await this.resolveBinding(startPath, explicitProjectId);
+        const identity = await this.git.identity(bound.repoRoot);
+        return { ...bound, head: identity.head, branch: identity.branch };
+    }
     async resolve(startPath, explicitProjectId) {
+        const bound = await this.resolveBinding(startPath, explicitProjectId);
+        const git = await this.git.manifest(bound.repoRoot);
+        return { ...bound, git };
+    }
+    async resolveBinding(startPath, explicitProjectId) {
         const repoRoot = await this.git.findRoot(startPath);
         const repositoryKey = await this.keyFor(repoRoot);
         const bindingPath = this.pathFor(repositoryKey);
@@ -48,10 +58,7 @@ export class RepositoryResolver {
         if (explicitProjectId && binding && explicitProjectId !== binding.projectId) {
             throw new Error('Explicit project does not match the local repository binding');
         }
-        const [repoFingerprint, git] = await Promise.all([
-            binding?.repoFingerprint ?? this.git.fingerprint(repoRoot, this.markerSchemaVersion),
-            this.git.manifest(repoRoot),
-        ]);
+        const repoFingerprint = binding?.repoFingerprint ?? (await this.git.fingerprint(repoRoot, this.markerSchemaVersion));
         return {
             repoRoot,
             markerPath,
@@ -60,14 +67,25 @@ export class RepositoryResolver {
             schemaVersion: binding?.schemaVersion ?? null,
             repoFingerprint,
             legacyFingerprints: binding ? [] : [await this.git.fingerprint(repoRoot, 1)],
-            git,
         };
     }
-    async writeBinding(repoRoot, projectId, fingerprint) {
+    async checkoutFingerprints(repoRoot) {
+        return [
+            ...new Set([
+                await this.git.fingerprint(repoRoot, 2),
+                await this.git.fingerprint(repoRoot, 1),
+            ]),
+        ];
+    }
+    async writeBinding(repoRoot, projectId, fingerprint, livesIn) {
         assertProjectId(projectId);
-        const repository = await this.resolve(repoRoot, projectId);
+        const root = await this.git.findRoot(repoRoot);
+        const home = livesIn !== undefined &&
+            /^[0-9a-f]{64}$/.test(fingerprint) &&
+            (await this.checkoutFingerprints(root)).includes(livesIn);
+        const repository = await this.resolve(root, home ? undefined : projectId);
         const older = repository.legacyFingerprints.includes(fingerprint);
-        if (fingerprint !== repository.repoFingerprint && !older) {
+        if (fingerprint !== repository.repoFingerprint && !older && !home) {
             throw new Error('The confirmed project fingerprint does not identify this repository');
         }
         const repositoryKey = await this.keyFor(repository.repoRoot);

package/runtime/dist/src/runtime/active-context-store.js

@@ -81,6 +81,9 @@ export class ActiveContextStore {
             const { verificationIntent: _verificationIntent, closeIntent: _closeIntent, ...pointerInput } = input;
             await this.writePointer({
                 ...pointerInput,
+                ...(!pointerInput.changeBaseline && existing?.changeBaseline
+                    ? { changeBaseline: existing.changeBaseline }
+                    : {}),
                 ...(sameSession && existing?.verificationIntent
                     ? { verificationIntent: existing.verificationIntent }
                     : {}),

package/runtime/dist/src/runtime/api-client.js

@@ -15,6 +15,7 @@ export const backendRecoveryOperationNames = [
     'project.resolve',
     'project.list',
     'project.restore',
+    'project.move_repository',
     'project.member_list',
     'organization.list',
     'project.member_add',

package/runtime/dist/src/runtime/branch-preferences.js

@@ -1,23 +1,4 @@
-import { sha256, stableStringify } from '../utilities/hash.js';
 import { BridgeRecoveryError } from './recovery-error.js';
-export function branchDecisionId(externalTaskId, base, name, keepCurrent) {
-    return ('task-base-' +
-        sha256(stableStringify({ externalTaskId, base, name: name ?? null, keepCurrent })));
-}
-export function branchChoices(preferences, current) {
-    const options = [];
-    for (const role of ['development', 'production', 'test']) {
-        const choice = preferences.branches[role];
-        if (choice.answered && choice.branch)
-            options.push({ id: role, label: role + ': ' + choice.remote + '/' + choice.branch });
-    }
-    options.splice(Math.min(1, options.length), 0, {
-        id: 'current',
-        label: 'Current branch: ' + (current ?? 'detached HEAD'),
-    });
-    options.push({ id: 'other', label: 'Another branch' }, { id: 'keep', label: 'Continue on this branch without creating a new branch' });
-    return options;
-}
 export async function resolveTaskBase(git, repoRoot, base, preferences) {
     if (base.kind === 'current' || base.kind === 'local') {
         const source = await git.sourceIdentity(repoRoot, base.kind === 'current' ? (base.commit ?? 'HEAD') : base.ref);