@codions/portta 0.0.0-develop.157.sha-ae5ce5e → 0.0.0-develop.162.sha-7b40859

package/dist/host.js

@@ -46312,6 +46312,9 @@ var AvailableBranchSchema = external_exports.object({
 var AvailableBranchesQuerySchema = external_exports.object({
   includeRemote: BooleanLikeSchema.optional()
 });
+var RemoveWorktreeQuerySchema = external_exports.object({
+  force: BooleanLikeSchema.optional()
+});
 var NumberLikePathParamSchema = external_exports.union([
   external_exports.number().int().nonnegative(),
   external_exports.string().regex(/^\d+$/).transform((value) => Number(value))
@@ -47245,6 +47248,7 @@ var apiContract = defineRoutes({
     summary: "Remove a worktree",
     path: apiPaths.removeWorktree,
     pathParams: WorktreeNameParamsSchema,
+    query: RemoveWorktreeQuerySchema,
     responses: {
       200: OkResponseSchema,
       ...commonErrorResponses
@@ -49084,6 +49088,21 @@ var NodeGitGateway = class {
     const result = tryRunGit(["diff", "HEAD", "--no-color"], cwd);
     return result.ok ? result.stdout : "";
   }
+  /**
+   * Commits reachable from HEAD and from nothing else that would survive this
+   * worktree: not on an origin branch, not on the project's main branch. It
+   * answers "would deleting this branch lose work", which `aheadCount` cannot:
+   * with no upstream and no remote at all, every commit counts as ahead.
+   */
+  countUnsavedCommits(cwd, baseBranch) {
+    const count = (args) => {
+      const result = tryRunGit(args, cwd);
+      return result.ok ? parseInt(result.stdout, 10) || 0 : null;
+    };
+    const excludingBase = baseBranch ? count(["rev-list", "--count", "HEAD", "--not", "--remotes=origin", baseBranch]) : null;
+    if (excludingBase !== null) return excludingBase;
+    return count(["rev-list", "--count", "HEAD", "--not", "--remotes=origin"]) ?? 0;
+  }
   listUnpushedCommits(cwd) {
     let result = tryRunGit(["log", "--oneline", "@{upstream}..HEAD"], cwd);
     if (!result.ok) {
@@ -52664,9 +52683,23 @@ var LifecycleService = class {
       throw this.wrapOperationError(error61);
     }
   }
-  async removeWorktree(branch) {
+  /**
+   * Removing a worktree deletes its branch with `--force`, so anything living
+   * only there is gone. Uncommitted changes and unpushed commits therefore
+   * refuse the removal unless the caller says to discard them.
+   */
+  async removeWorktree(branch, options = {}) {
     try {
       const resolved2 = await this.resolveExistingWorktree(branch);
+      if (!options.force) {
+        const unsaved = this.describeUnsavedWork(resolved2.entry);
+        if (unsaved) {
+          throw new LifecycleError(
+            `Worktree has ${unsaved}: ${branch}. Commit or push them, or remove with --force to discard them.`,
+            409
+          );
+        }
+      }
       await this.removeResolvedWorktree(resolved2);
     } catch (error61) {
       throw this.wrapOperationError(error61);
@@ -52677,15 +52710,21 @@ var LifecycleService = class {
       const resolvedWorktrees = await this.resolveAllWorktrees();
       const sessionName = buildProjectSessionName(this.deps.projectRoot);
       const removedBranches = [];
+      const keptBranches = [];
       for (const resolved2 of resolvedWorktrees) {
         const branch = resolved2.entry.branch ?? resolved2.entry.path;
         if (await this.deps.sessions.hasWindow(sessionName, buildWorktreeWindowName(branch))) {
           continue;
         }
+        const unsaved = this.describeUnsavedWork(resolved2.entry);
+        if (unsaved) {
+          keptBranches.push({ branch, reason: unsaved });
+          continue;
+        }
         await this.removeResolvedWorktree(resolved2);
         removedBranches.push(branch);
       }
-      return { removedBranches };
+      return { removedBranches, keptBranches };
     } catch (error61) {
       throw this.wrapOperationError(error61);
     }
@@ -53182,6 +53221,14 @@ ${oneshotPrompt}` : oneshotPrompt ?? baseSystemPrompt;
     }
     return cleanupErrors.length > 0 ? cleanupErrors.join("; ") : null;
   }
+  /** What this worktree holds that exists nowhere else, or null when it is safe to delete. */
+  describeUnsavedWork(entry) {
+    const status = this.deps.git.readWorktreeStatus(entry.path);
+    if (status.dirty) return "uncommitted changes";
+    const commits = this.deps.git.countUnsavedCommits(entry.path, this.deps.config.workspace.mainBranch);
+    if (commits > 0) return `${commits} commit${commits === 1 ? "" : "s"} that are only here`;
+    return null;
+  }
   ensureNoUncommittedChanges(entry) {
     const status = this.deps.git.readWorktreeStatus(entry.path);
     if (status.dirty) {
@@ -53278,7 +53325,7 @@ ${oneshotPrompt}` : oneshotPrompt ?? baseSystemPrompt;
     const cleanupErrors = [];
     for (const branch of [...branches].reverse()) {
       try {
-        await this.removeWorktree(branch);
+        await this.removeWorktree(branch, { force: true });
       } catch (error61) {
         cleanupErrors.push(`rollback failed for ${branch}: ${toErrorMessage2(error61)}`);
       }
@@ -58969,14 +59016,14 @@ ${resolvedPrompt}` : conversationContext;
     201
   );
 }
-async function apiDeleteWorktree(project, name) {
+async function apiDeleteWorktree(project, name, force) {
   return project.withRemovingBranch(name, async () => {
     log.info(`[worktree:rm] name=${name}`);
     const worktree = project.runtime.projectRuntime.getWorktreeByBranch(name);
     const environmentId = worktree ? environmentIdForWorkspace(project.environments.projectEnvironments(), worktree.worktreeId) : null;
     const environment = environmentId ? project.environments.environmentForProject(environmentId) : null;
     if (environment) await project.environments.destroyEnvironmentRecord(environment);
-    await project.runtime.lifecycleService.removeWorktree(name);
+    await project.runtime.lifecycleService.removeWorktree(name, { force });
     log.debug(`[worktree:rm] done name=${name}`);
     return jsonResponse({ ok: true });
   });
@@ -59163,9 +59210,9 @@ function worktreeRoutes(deps) {
   const app = projectRouter();
   projectRoute(app, deps, "fetchWorktrees", "Worktrees", (project) => apiGetWorktrees(project));
   projectRoute(app, deps, "createWorktree", "Worktrees", (project, { body }) => apiCreateWorktree(project, body));
-  projectRoute(app, deps, "removeWorktree", "Worktrees", (project, { params }) => {
+  projectRoute(app, deps, "removeWorktree", "Worktrees", (project, { params, query: query2 }) => {
     const name = worktreeName(params.name);
-    return name instanceof Response ? name : apiDeleteWorktree(project, name);
+    return name instanceof Response ? name : apiDeleteWorktree(project, name, query2.force === true);
   });
   projectRoute(app, deps, "openWorktree", "Worktrees", (project, { params, body }) => {
     const name = worktreeName(params.name);
@@ -72223,7 +72270,7 @@ function createDaemonTaskflowHost(context) {
       port: hostListen(env2).port,
       workflowBuiltinsDir: taskflowAssets(env2).workflowBuiltinsDir,
       version: env2.PORTTA_VERSION || "0.0.0-local",
-      buildDate: true ? "2026-09-16T21:32:25Z" : (/* @__PURE__ */ new Date()).toISOString(),
+      buildDate: true ? "2026-09-17T23:23:40Z" : (/* @__PURE__ */ new Date()).toISOString(),
       environmentStore: createEnvironmentStore(paths.database),
       hostEnvironmentProvider: new HostEnvironmentProvider(),
       devContainerProvider: new DevContainerProvider(),

package/dist/runtime/VERSION

@@ -1 +1 @@
-0.0.0-develop.157.sha-ae5ce5e
+0.0.0-develop.162.sha-7b40859

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codions/portta",
-  "version": "0.0.0-develop.157.sha-ae5ce5e",
+  "version": "0.0.0-develop.162.sha-7b40859",
   "description": "Machine-first CLI for a shared Docker development gateway",
   "license": "MIT",
   "type": "module",