@junctionpanel/server 0.1.86 → 0.1.88

package/dist/server/server/session.js

@@ -2887,6 +2887,12 @@ export class Session {
         }
     }
     toCheckoutError(error) {
+        if (error instanceof SessionRequestError) {
+            if (error.code === DIRTY_WORKTREE_CONFIRMATION_REQUIRED) {
+                return { code: DIRTY_WORKTREE_CONFIRMATION_REQUIRED, message: error.message };
+            }
+            return { code: 'UNKNOWN', message: error.message };
+        }
         if (error instanceof NotGitRepoError) {
             return { code: 'NOT_GIT_REPO', message: error.message };
         }
@@ -5309,6 +5315,7 @@ export class Session {
         const { requestId } = msg;
         let targetPath = msg.worktreePath;
         let repoRoot = msg.repoRoot ?? null;
+        const dirtyWorktreeBehavior = msg.dirtyWorktreeBehavior ?? 'reject';
         try {
             if (!targetPath) {
                 if (!repoRoot || !msg.branchName) {
@@ -5344,6 +5351,10 @@ export class Session {
             if (!repoRoot) {
                 throw new Error('Unable to resolve repo root for worktree');
             }
+            if (dirtyWorktreeBehavior !== 'discard' &&
+                (await this.hasDirtyWorktreeState(targetPath))) {
+                throw new SessionRequestError(DIRTY_WORKTREE_CONFIRMATION_REQUIRED, 'Archiving this workspace will discard uncommitted or untracked files in the worktree.');
+            }
             const archiveResult = await this.archiveJunctionWorktree({
                 targetPath,
                 repoRoot,