@norman-else/dsh-claude 0.1.37 → 0.1.38

package/lib/index.mjs

@@ -3352,16 +3352,23 @@ function registerClaudeProjectionRoute(ctx, sidecar, ownsSession, commandsForSes
 	const info = (message) => {
 		ctx.logger?.info?.(message);
 	};
-	const assembleMeta = async (sessionId) => {
+	/** Everything the host already knows, without touching the repository. */
+	const localMeta = (sessionId) => {
 		const owned = ownsSession(sessionId);
-		const repository = owned ? await repositoryForSession(sessionId) : void 0;
 		return {
 			owned,
 			commands: commandsForSession(sessionId),
-			...repository === void 0 ? {} : { repository },
 			reviewComments: owned ? reviewCommentsForSession(sessionId) : []
 		};
 	};
+	const assembleMeta = async (sessionId) => {
+		const meta = localMeta(sessionId);
+		const repository = meta.owned ? await repositoryForSession(sessionId) : void 0;
+		return {
+			...meta,
+			...repository === void 0 ? {} : { repository }
+		};
+	};
 	const streamMulti = async (res, io, sessionIds) => {
 		info(`dsh-claude: projection stream opened for ${sessionIds.length} session(s)`);
 		let textDeltas = 0;
@@ -3383,8 +3390,20 @@ function registerClaudeProjectionRoute(ctx, sidecar, ownsSession, commandsForSes
 			}
 		};
 		const metas = /* @__PURE__ */ new Map();
+		const writeMeta = (sessionId, meta) => {
+			metas.set(sessionId, meta);
+			writeLine({
+				type: "meta",
+				session: sessionId,
+				owned: meta.owned,
+				commands: meta.commands,
+				...meta.repository === void 0 ? {} : { repository: meta.repository },
+				reviewComments: meta.reviewComments
+			});
+		};
 		const writeSnapshot = async (sessionId) => {
-			const [projection, meta] = await Promise.all([sidecar.read(sessionId), assembleMeta(sessionId)]);
+			const projection = await sidecar.read(sessionId);
+			const meta = metas.get(sessionId) ?? localMeta(sessionId);
 			metas.set(sessionId, meta);
 			writeLine({
 				type: "snapshot",
@@ -3392,6 +3411,9 @@ function registerClaudeProjectionRoute(ctx, sidecar, ownsSession, commandsForSes
 				seq: sidecar.sequence(sessionId),
 				...envelope(projection, meta)
 			});
+			const probed = await assembleMeta(sessionId);
+			if (closed || JSON.stringify(probed) === JSON.stringify(metas.get(sessionId))) return;
+			writeMeta(sessionId, probed);
 		};
 		const unsubscribes = sessionIds.map((sessionId) => sidecar.subscribe(sessionId, (delta) => {
 			switch (delta.kind) {
@@ -3458,15 +3480,7 @@ function registerClaudeProjectionRoute(ctx, sidecar, ownsSession, commandsForSes
 					const next = await assembleMeta(sessionId);
 					if (closed) return;
 					if (JSON.stringify(next) === JSON.stringify(metas.get(sessionId))) continue;
-					metas.set(sessionId, next);
-					writeLine({
-						type: "meta",
-						session: sessionId,
-						owned: next.owned,
-						commands: next.commands,
-						...next.repository === void 0 ? {} : { repository: next.repository },
-						reviewComments: next.reviewComments
-					});
+					writeMeta(sessionId, next);
 				}
 				writeLine({ type: "ping" });
 			})().catch(() => void 0);
@@ -4336,7 +4350,7 @@ var RepositorySetupService = class {
 				}
 			}
 			if (changed) await this.#writeLeases(retained);
-			await this.#removeUnleasedDirectories(retained, active, now);
+			await this.#removeUnleasedDirectories(retained, active, now, archiveSessions);
 		});
 	}
 	/** Remove directories under the plugin's own worktree root that no lease and
@@ -4344,7 +4358,7 @@ var RepositorySetupService = class {
 	*  lease write failed, otherwise leaves a directory nothing will ever sweep.
 	*  The grace period covers the gap between `worktree add` and the lease
 	*  write, so a worktree being created right now is never taken. */
-	async #removeUnleasedDirectories(retained, active, now) {
+	async #removeUnleasedDirectories(retained, active, now, archiveSessions) {
 		const leased = new Set(retained.map((item) => comparablePath(item.path)));
 		let entries;
 		try {
@@ -4361,6 +4375,7 @@ var RepositorySetupService = class {
 				if (!info.isDirectory()) continue;
 				const created = info.birthtimeMs > 0 ? info.birthtimeMs : info.mtimeMs;
 				if (Math.max(0, now - created) < this.#cleanupGraceMs) continue;
+				await archiveSessions?.(path).catch(() => void 0);
 				await rm(path, {
 					recursive: true,
 					force: true
@@ -5105,7 +5120,7 @@ async function streamSetup(res, service, input) {
 *  The prefix is registered as a stream because the setup POST holds its
 *  connection open for the whole worktree build; the short sibling paths ride
 *  the same registration and answer with `json` before releasing it. */
-function registerRepositorySetupRoute(ctx, service) {
+function registerRepositorySetupRoute(ctx, service, sweep) {
 	registerPluginRoute(ctx, {
 		mode: "stream",
 		kind: "prefix",
@@ -5139,6 +5154,11 @@ function registerRepositorySetupRoute(ctx, service) {
 					const input = await readJson$5(io);
 					return json(res, 200, await service.cleanupMerged(string$2(input, "path"), string$2(input, "baseBranch")));
 				}
+				if (pathname === `/plugins/dsh-claude/repository/setup/sweep`) {
+					if (io.method !== "POST") return json(res, 405, { error: "method not allowed" });
+					sweep?.();
+					return json(res, 200, { ok: true });
+				}
 				if (pathname === `/plugins/dsh-claude/repository/setup/bind`) {
 					if (io.method !== "POST") return json(res, 405, { error: "method not allowed" });
 					const input = await readJson$5(io);
@@ -7853,6 +7873,7 @@ async function apply(ctx, config) {
 		reviewComments.disposeSession(agent.id);
 		await supervisor.disposeSession(agent.id);
 	});
+	let sweepWorktrees;
 	const injectWorkspaceRegistry = ctx.inject;
 	injectWorkspaceRegistry(["workspaceRegistry"], (sweepCtx) => {
 		const archiveSessions = async (worktreePath) => {
@@ -7873,9 +7894,13 @@ async function apply(ctx, config) {
 		};
 		sweepCtx.effect(() => {
 			sweep();
+			sweepWorktrees = sweep;
 			const timer = setInterval(sweep, 6e4);
 			timer.unref?.();
-			return () => clearInterval(timer);
+			return () => {
+				sweepWorktrees = void 0;
+				clearInterval(timer);
+			};
 		}, "dsh-claude: worktree reconciliation");
 	});
 	ctx.effect(() => () => reviewComments.dispose(), "dsh-claude: review comments store");
@@ -7890,7 +7915,7 @@ async function apply(ctx, config) {
 			defaultLimits,
 			onUpdated: applySettingsOverrides
 		});
-		registerRepositorySetupRoute(webCtx, repositorySetup);
+		registerRepositorySetupRoute(webCtx, repositorySetup, () => sweepWorktrees?.());
 		registerRepositoryStatusRoute(webCtx, repositoryStatus);
 		registerRepositoryFileRoute(webCtx, repositoryStatus);
 		registerJiraRoute(webCtx, new JiraService());