@norman-else/dsh-claude 0.1.37 → 0.1.39

package/lib/index.mjs

@@ -1180,6 +1180,80 @@ function normalizeSdkMessage(message) {
 	}];
 }
 //#endregion
+//#region src/model-catalog.ts
+/** What the selector shows before any session has initialized in this Host
+*  process -- a fresh app launch lands here. `default` is the only id that is
+*  valid on every release and plan; the aliases after it are the stable
+*  `/model` spellings Claude Code has kept across releases, so the menu is
+*  usable at first paint instead of a single row. The first initialize
+*  response replaces the whole list with the CLI's own lineup. */
+const SEED = [
+	{
+		id: "default",
+		name: "Default (recommended)",
+		description: ""
+	},
+	{
+		id: "opus[1m]",
+		name: "Opus (1M context)",
+		description: "",
+		contextWindow: 1e6
+	},
+	{
+		id: "fable",
+		name: "Fable",
+		description: ""
+	},
+	{
+		id: "sonnet",
+		name: "Sonnet",
+		description: ""
+	},
+	{
+		id: "haiku",
+		name: "Haiku",
+		description: ""
+	}
+];
+/** A 1M-context route spells it in the id (`opus[1m]`, `claude-fable-5[1m]`),
+*  so this needs no capacity table either. It is only a floor: the supervisor
+*  overrides it with the window the CLI reports once a turn has run. */
+function declaredContextWindow(row) {
+	return /\[1m\]$/u.test(row.resolvedModel ?? row.value) ? 1e6 : void 0;
+}
+function projectModel(row) {
+	const contextWindow = declaredContextWindow(row);
+	return {
+		id: row.value,
+		name: row.displayName,
+		description: row.description,
+		...contextWindow === void 0 ? {} : { contextWindow }
+	};
+}
+let latest$1;
+/**
+* Learn the lineup from one session's initialize response.
+* @param models - the CLI's own `/model` rows; an empty list is ignored so a
+*   CLI that answers without a catalog cannot blank the selector.
+*/
+function recordClaudeModels(models) {
+	if (models.length === 0) return;
+	latest$1 = models.map(projectModel);
+}
+/** The lineup to advertise: whatever the CLI last reported, else the seed. */
+function latestClaudeModels() {
+	return latest$1 ?? SEED;
+}
+/**
+* Look one id up in the current lineup.
+* @param id - the id DSH persisted on the session, which may name a model the
+*   running CLI no longer lists.
+* @returns the row, or undefined when the lineup does not cover the id.
+*/
+function claudeModelRow(id) {
+	return latestClaudeModels().find((row) => row.id === id);
+}
+//#endregion
 //#region src/plan-usage.ts
 /** Claude.ai plan rate-limit windows behind the CLI's `/usage` panel.
 *
@@ -1508,9 +1582,11 @@ var ClaudeSupervisor = class {
 		return this.#runMetadata(agent, model, (query) => query.supportedCommands());
 	}
 	async contextUsage(agent, model = this.#config.defaultModel) {
-		const usage = await this.#runMetadata(agent, model, (query) => query.getContextUsage());
-		this.#recordContextWindow(model, usage);
-		return usage;
+		return this.#runMetadata(agent, model, async (query, entry) => {
+			const usage = await query.getContextUsage();
+			this.#recordContextWindow(entry.model, usage);
+			return usage;
+		});
 	}
 	/** Cache a window under both the selector id the caller asked for and the
 	*  concrete model the CLI reports, so either name resolves it later. */
@@ -1581,19 +1657,13 @@ var ClaudeSupervisor = class {
 			entry.idleTimer = void 0;
 		}
 		const model = request.model ?? this.#config.defaultModel;
-		if (request.thinkingMode !== entry.thinkingMode) {
+		if (request.thinkingMode !== entry.thinkingMode || model !== entry.model) {
 			this.#entries.delete(sessionId);
 			await this.#disposeEntry(entry);
 			entry = await this.#createEntry(request.agent, model, request.thinkingMode);
 			this.#entries.set(sessionId, entry);
 			await entry.sdkInitialization;
-		} else {
-			await this.#syncPermissionMode(entry);
-			if (model !== entry.model) {
-				await this.#control(entry, entry.query.setModel(model), "Claude Code model switch");
-				entry.model = model;
-			}
-		}
+		} else await this.#syncPermissionMode(entry);
 		const promptUuid = randomUUID();
 		const cursor = currentClaudeActivityCursor(request.agent.session.events);
 		cursor.nextOrdinal = (await this.#sidecar.read(sessionId)).activities.reduce((next, activity) => activity.turn === cursor.turn && activity.step === cursor.step ? Math.max(next, activity.ordinal + 1) : next, 0);
@@ -1692,10 +1762,6 @@ var ClaudeSupervisor = class {
 			entry.idleTimer = void 0;
 		}
 		await this.#syncPermissionMode(entry);
-		if (model !== entry.model) {
-			await this.#control(entry, entry.query.setModel(model), "Claude Code model switch");
-			entry.model = model;
-		}
 		return entry;
 	}
 	/** Run one SDK control request against a live entry, and discard the entry if
@@ -1831,7 +1897,8 @@ var ClaudeSupervisor = class {
 			options
 		});
 		entry.pump = this.#runDetached(() => this.#pump(entry));
-		entry.sdkInitialization = withTimeout(entry.query.initializationResult(), CLAUDE_INITIALIZATION_TIMEOUT_MS, "Claude SDK initialization").then(() => {
+		entry.sdkInitialization = withTimeout(entry.query.initializationResult(), CLAUDE_INITIALIZATION_TIMEOUT_MS, "Claude SDK initialization").then((initialization) => {
+			recordClaudeModels(initialization.models);
 			if (entry.state === "starting") entry.state = "idle";
 		});
 		entry.sdkInitialization.catch((error) => this.#handleDisconnect(entry, error));
@@ -2604,34 +2671,6 @@ function formatReviewComments(comments) {
 }
 //#endregion
 //#region src/adapter.ts
-const MODELS = [
-	{
-		id: "default",
-		name: "Default (recommended)",
-		description: ""
-	},
-	{
-		id: "opus[1m]",
-		name: "Opus (1M context)",
-		description: "",
-		contextWindow: 1e6
-	},
-	{
-		id: "fable",
-		name: "Fable",
-		description: ""
-	},
-	{
-		id: "sonnet",
-		name: "Sonnet",
-		description: ""
-	},
-	{
-		id: "haiku",
-		name: "Haiku",
-		description: ""
-	}
-];
 const THINKING_MODES = [
 	{
 		id: "off",
@@ -2818,7 +2857,7 @@ var ClaudeCodeAdapter = class extends LlmAdapter {
 		return NO_RETRY_POLICY;
 	}
 	async listModels(provider) {
-		return MODELS.map((model) => ({
+		return latestClaudeModels().map((model) => ({
 			provider,
 			id: model.id,
 			name: model.name,
@@ -2827,8 +2866,8 @@ var ClaudeCodeAdapter = class extends LlmAdapter {
 		}));
 	}
 	async resolveModel(provider, model, _signal) {
-		const known = MODELS.find((item) => item.id === model);
-		const contextWindow = this.#supervisor.contextWindow(model) ?? (known !== void 0 && "contextWindow" in known ? known.contextWindow : void 0);
+		const known = claudeModelRow(model);
+		const contextWindow = this.#supervisor.contextWindow(model) ?? known?.contextWindow;
 		return {
 			provider,
 			id: model,
@@ -3352,16 +3391,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 +3429,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 +3450,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 +3519,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 +4389,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 +4397,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 +4414,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 +5159,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 +5193,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 +7912,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 +7933,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 +7954,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());