@zixt/host 0.0.39 → 0.0.40

package/dist/index.js

@@ -31,7 +31,7 @@ import { homedir } from "node:os";
 // package.json
 var package_default = {
   name: "@zixt/host",
-  version: "0.0.39",
+  version: "0.0.40",
   type: "module",
   exports: {
     ".": "./src/client.ts",
@@ -15907,6 +15907,8 @@ var TaskGitSummary = external_exports.object({
       isWorktree: external_exports.boolean().optional(),
       /** False means the Task used this repository, then removed its checkout after integration. */
       available: external_exports.boolean().optional(),
+      /** False preserves the Task branch after a shared checkout switches back. */
+      checkedOut: external_exports.boolean().optional(),
       branch: taskGitSummaryLabel(512, "branch").nullable(),
       ahead: external_exports.number().int().min(0),
       behind: external_exports.number().int().min(0),
@@ -16147,6 +16149,8 @@ var TaskWorkingContextBase = external_exports.object({
       isWorktree: external_exports.boolean(),
       /** Absent is legacy-current; false preserves a cleaned-up Task repository as history. */
       available: external_exports.boolean().optional(),
+      /** Absent is legacy-current; false means this retained branch is no longer checked out. */
+      checkedOut: external_exports.boolean().optional(),
       /** Null is an observed detached HEAD, never an unknown branch. */
       branch: safeWorkingContextLabel(512, "branch").nullable(),
       headSha: external_exports.string().regex(/^(?:[a-f0-9]{40}|[a-f0-9]{64})$/).nullable(),
@@ -33069,6 +33073,7 @@ async function repositoryState(directory, git, env, signal) {
     root,
     isWorktree: gitDirectory !== commonDirectory,
     available: true,
+    checkedOut: true,
     branch,
     headSha,
     upstream,
@@ -33105,13 +33110,42 @@ async function collectWorkingContext(input) {
     ...uniqueRepositories.length > 0 ? { repositories: uniqueRepositories } : {}
   });
 }
-function preserveObservedRepositories(current, previous, fixedRepositoryRoots) {
+function preserveObservedRepositories(current, previous, fixedRepositoryRoots, initial = null) {
   const fixed = new Set(fixedRepositoryRoots);
   const currentRepositories = current.repositories ?? [];
   const currentRoots = new Set(currentRepositories.map(({ root }) => root));
-  const liveTaskRepositories = currentRepositories.filter(({ root }) => !fixed.has(root));
-  const liveFixedRepositories = currentRepositories.filter(({ root }) => fixed.has(root));
-  const retained = (previous?.repositories ?? []).filter(({ root }) => !fixed.has(root) && !currentRoots.has(root)).map((repository) => ({ ...repository, available: false }));
+  const previousByRoot = new Map(
+    (previous?.repositories ?? []).map((repository) => [repository.root, repository])
+  );
+  const initialByRoot = new Map(
+    (initial?.repositories ?? []).map((repository) => [repository.root, repository])
+  );
+  const sameRef = (left, right) => left.branch === right.branch && (left.branch !== null || left.headSha === right.headSha);
+  const liveRepositories = currentRepositories.map((repository) => {
+    if (!fixed.has(repository.root)) return repository;
+    const previousRepository = previousByRoot.get(repository.root);
+    const initialRepository = initialByRoot.get(repository.root);
+    if (!previousRepository || !initialRepository || !sameRef(repository, initialRepository)) {
+      return repository;
+    }
+    if (previousRepository.checkedOut !== false && sameRef(previousRepository, initialRepository)) {
+      return repository;
+    }
+    return {
+      ...previousRepository,
+      root: repository.root,
+      isWorktree: repository.isWorktree,
+      available: true,
+      checkedOut: false
+    };
+  });
+  const liveTaskRepositories = liveRepositories.filter(({ root }) => !fixed.has(root));
+  const liveFixedRepositories = liveRepositories.filter(({ root }) => fixed.has(root));
+  const retained = (previous?.repositories ?? []).filter(({ root }) => !fixed.has(root) && !currentRoots.has(root)).map((repository) => ({
+    ...repository,
+    available: false,
+    checkedOut: false
+  }));
   const repositories = [...liveTaskRepositories, ...retained, ...liveFixedRepositories].slice(
     0,
     20
@@ -34171,6 +34205,7 @@ ${attachmentSection}` : prompt;
       let activeWorkingContextReport = null;
       let previousWorkingContext = "";
       let previousWorkingContextValue = null;
+      let initialWorkingContextValue = null;
       const observedWorkingDirectories = /* @__PURE__ */ new Set();
       let observedPathRefreshPending = false;
       const workingContextAbort = new AbortController();
@@ -34188,12 +34223,15 @@ ${attachmentSection}` : prompt;
           git,
           env: workingContextEnvironments.git,
           signal: workingContextAbort.signal
+        }).then((context) => {
+          initialWorkingContextValue ??= context;
+          return preserveObservedRepositories(
+            context,
+            previousWorkingContextValue,
+            [cwd, ...preparedWorkspace ? [preparedWorkspace.path] : []],
+            initialWorkingContextValue
+          );
         }).then(
-          (context) => preserveObservedRepositories(context, previousWorkingContextValue, [
-            cwd,
-            ...preparedWorkspace ? [preparedWorkspace.path] : []
-          ])
-        ).then(
           (context) => pullRequests.enrich(context, ghContextCommand, {
             ...options.forcePullRequest ? { force: true } : {},
             ...gitContextCommand ? { gitCommand: gitContextCommand } : {},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zixt/host",
-  "version": "0.0.39",
+  "version": "0.0.40",
   "type": "module",
   "exports": {
     ".": "./src/client.ts",