@getpaseo/server 0.16.1 → 0.16.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (41) hide show
  1. package/dist/server/builtin-plugins/package.json +1 -1
  2. package/dist/server/builtin-plugins/worktree-include/server/copy.ts +162 -16
  3. package/dist/server/server/agent/agent-manager.js +2 -1
  4. package/dist/server/server/agent/providers/claude/agent.js +34 -2
  5. package/dist/server/server/agent/providers/omp/agent.d.ts +1 -0
  6. package/dist/server/server/agent/providers/omp/agent.js +22 -0
  7. package/dist/server/server/agent/providers/omp/rpc-types.d.ts +4 -0
  8. package/dist/server/server/agent/providers/omp/rpc-types.js +8 -0
  9. package/dist/server/server/agent/tools/paseo-tools.js +8 -2
  10. package/dist/server/server/bootstrap.js +2 -2
  11. package/dist/server/server/file-observer/index.d.ts +1 -0
  12. package/dist/server/server/file-observer/index.js +14 -1
  13. package/dist/server/server/file-observer/internal/observation.js +4 -0
  14. package/dist/server/server/hub/relationship-controller.js +26 -15
  15. package/dist/server/server/hub/relationship-remote.d.ts +1 -1
  16. package/dist/server/server/hub/relationship-remote.js +2 -2
  17. package/dist/server/server/resolve-worktree-creation-intent.d.ts +1 -1
  18. package/dist/server/server/session/workspace-recovery/workspace-recovery-service.js +30 -4
  19. package/dist/server/server/test-fixtures/reconciliation-registries.d.ts +1 -0
  20. package/dist/server/server/websocket-server.d.ts +5 -0
  21. package/dist/server/server/websocket-server.js +10 -2
  22. package/dist/server/server/workspace-archive-service.js +10 -2
  23. package/dist/server/server/workspace-git-service.d.ts +1 -0
  24. package/dist/server/server/workspace-git-service.js +31 -5
  25. package/dist/server/server/workspace-registry.d.ts +2 -0
  26. package/dist/server/server/workspace-registry.js +2 -0
  27. package/dist/server/terminal/terminal-worker-process.js +16 -14
  28. package/dist/server/terminal/terminal-worker-socket-path.d.ts +15 -1
  29. package/dist/server/terminal/terminal-worker-socket-path.js +57 -9
  30. package/dist/server/terminal-worker/terminal-worker.mjs +51 -23
  31. package/dist/server/utils/worktree.d.ts +14 -1
  32. package/dist/server/utils/worktree.js +58 -7
  33. package/dist/server/web-ui/_expo/static/js/web/{index-6de36f49f1c767e50d1cf95ae05eb46a.js → index-3d51f4c450eeff5bd838a646e9c611f2.js} +16 -16
  34. package/dist/server/web-ui/_expo/static/js/web/index-3d51f4c450eeff5bd838a646e9c611f2.js.br +0 -0
  35. package/dist/server/web-ui/_expo/static/js/web/index-3d51f4c450eeff5bd838a646e9c611f2.js.gz +0 -0
  36. package/dist/server/web-ui/index.html +1 -1
  37. package/dist/server/web-ui/index.html.br +0 -0
  38. package/dist/server/web-ui/index.html.gz +0 -0
  39. package/package.json +6 -6
  40. package/dist/server/web-ui/_expo/static/js/web/index-6de36f49f1c767e50d1cf95ae05eb46a.js.br +0 -0
  41. package/dist/server/web-ui/_expo/static/js/web/index-6de36f49f1c767e50d1cf95ae05eb46a.js.gz +0 -0
@@ -789,6 +789,35 @@ async function assertWorktreeBelongsToRepo(cwd, worktreePath) {
789
789
  throw new Error("Refusing to delete non-Paseo worktree");
790
790
  }
791
791
  }
792
+ export async function readWorktreeHead(worktreePath) {
793
+ if (!(await pathExists(join(worktreePath, ".git"))))
794
+ return null;
795
+ try {
796
+ const { stdout } = await runGitCommand(["rev-parse", "--verify", "HEAD^{commit}"], {
797
+ cwd: worktreePath,
798
+ });
799
+ return stdout.trim();
800
+ }
801
+ catch {
802
+ return null;
803
+ }
804
+ }
805
+ export async function readWorktreeHeadReference(worktreePath) {
806
+ if (!(await pathExists(join(worktreePath, ".git"))))
807
+ return null;
808
+ try {
809
+ const result = await runGitCommand(["symbolic-ref", "--quiet", "HEAD"], {
810
+ cwd: worktreePath,
811
+ acceptExitCodes: [0, 1],
812
+ });
813
+ if (result.exitCode === 0)
814
+ return result.stdout.trim();
815
+ return readWorktreeHead(worktreePath);
816
+ }
817
+ catch {
818
+ return null;
819
+ }
820
+ }
792
821
  export async function deletePaseoWorktree({ cwd, worktreePath, teardownCwds, worktreeSlug, worktreesRoot, paseoHome, worktreesBaseRoot, registryProven, }) {
793
822
  if (!worktreePath && !worktreeSlug) {
794
823
  throw new Error("worktreePath or worktreeSlug is required");
@@ -835,6 +864,12 @@ export async function deletePaseoWorktree({ cwd, worktreePath, teardownCwds, wor
835
864
  teardownCwd,
836
865
  });
837
866
  }
867
+ const commit = await readWorktreeHead(resolvedWorktree);
868
+ if (commit) {
869
+ await runGitCommand(["update-ref", `refs/paseo/kept-commits/${commit}`, commit], {
870
+ cwd: resolvedWorktree,
871
+ });
872
+ }
838
873
  }
839
874
  if (cwd) {
840
875
  try {
@@ -957,10 +992,7 @@ export async function resolveDefaultWorktreePath(options) {
957
992
  candidate = `${original}-${suffix++}`;
958
993
  return candidate;
959
994
  }
960
- /**
961
- * Create a git worktree with proper naming conventions
962
- */
963
- export const createWorktree = async ({ cwd, source, worktreeSlug, paseoHome, worktreesRoot, worktreePath: explicitWorktreePath, }) => {
995
+ export async function createWorktree({ cwd, source, worktreeSlug, paseoHome, worktreesRoot, worktreePath: explicitWorktreePath, }) {
964
996
  const branchesBefore = source.kind === "checkout-branch" ||
965
997
  source.kind === "checkout-change-request" ||
966
998
  source.kind === "checkout-github-pr"
@@ -981,14 +1013,14 @@ export const createWorktree = async ({ cwd, source, worktreeSlug, paseoHome, wor
981
1013
  timeout: 120000,
982
1014
  });
983
1015
  worktreePath = await normalizePathForOwnership(worktreePath);
984
- if (sourcePlan.pushRemote) {
1016
+ if (sourcePlan.pushRemote && sourcePlan.branchName) {
985
1017
  await configureWorktreePushRemote({
986
1018
  cwd,
987
1019
  branchName: sourcePlan.branchName,
988
1020
  remote: sourcePlan.pushRemote,
989
1021
  });
990
1022
  }
991
- if (sourcePlan.trackingRemote) {
1023
+ if (sourcePlan.trackingRemote && sourcePlan.branchName) {
992
1024
  await configureWorktreeTrackingRemote({
993
1025
  cwd,
994
1026
  branchName: sourcePlan.branchName,
@@ -1017,7 +1049,7 @@ export const createWorktree = async ({ cwd, source, worktreeSlug, paseoHome, wor
1017
1049
  }
1018
1050
  throw error;
1019
1051
  }
1020
- };
1052
+ }
1021
1053
  async function resolveRestoredWorktreeSourcePlan(cwd, source) {
1022
1054
  await validateGitBranchName(cwd, source.branchName);
1023
1055
  await ensureLocalBranch(cwd, source.branchName);
@@ -1044,6 +1076,23 @@ async function resolveRestoredWorktreeSourcePlan(cwd, source) {
1044
1076
  addArguments: [source.branchName],
1045
1077
  };
1046
1078
  }
1079
+ async function resolveRestoredCommitSourcePlan(cwd, source) {
1080
+ let exactBase;
1081
+ if (isQualifiedRef(source.baseRef)) {
1082
+ try {
1083
+ exactBase = await resolveBaseBranchForWorktree(cwd, source.baseRef);
1084
+ }
1085
+ catch {
1086
+ // Restore the saved commit even when its comparison ref no longer exists.
1087
+ }
1088
+ }
1089
+ return {
1090
+ branchName: null,
1091
+ metadataBaseRefName: normalizeRequiredBaseBranch(source.baseRef),
1092
+ ...(exactBase ? { metadataBaseRef: exactBase } : {}),
1093
+ addArguments: ["--detach", source.commit],
1094
+ };
1095
+ }
1047
1096
  async function resolveRestoredWorktreeFromBasePlan(cwd, source) {
1048
1097
  await validateGitBranchName(cwd, source.branchName);
1049
1098
  const baseRef = await resolveBaseBranchForWorktree(cwd, source.baseRef);
@@ -1082,6 +1131,8 @@ async function resolveWorktreeSourcePlan({ cwd, source, desiredSlug, }) {
1082
1131
  return resolveBranchOffWorktreeSourcePlan(cwd, source, desiredSlug);
1083
1132
  case "restore":
1084
1133
  return resolveRestoredWorktreeSourcePlan(cwd, source);
1134
+ case "restore-commit":
1135
+ return resolveRestoredCommitSourcePlan(cwd, source);
1085
1136
  case "restore-from-base":
1086
1137
  return resolveRestoredWorktreeFromBasePlan(cwd, source);
1087
1138
  case "checkout-branch": {