@norman-else/dsh-claude 0.1.36 → 0.1.38

package/lib/client.js

@@ -3630,7 +3630,7 @@ window.__ModuleLoader__.load({
 			`body[data-ds-dark-theme] .${CLAUDE_MARKDOWN_SCOPE}{`,
 			palette(PIERRE_DARK, "#1a1a19", "#1a1a19", INLINE_FILL_DARK),
 			"}",
-			`.${CLAUDE_MARKDOWN_SCOPE} :not(pre)>code{color:${CLAY_EMPHASIZED};border-radius:4px;padding:1px 2px}`,
+			`.${CLAUDE_MARKDOWN_SCOPE} :not(pre)>code{color:${CLAY_EMPHASIZED};border-radius:4px;padding:1px 2px;font-size:1.05em!important}`,
 			`body[data-ds-dark-theme] .${CLAUDE_MARKDOWN_SCOPE} :not(pre)>code{color:${CLAY}}`,
 			`.${CLAUDE_MARKDOWN_SCOPE} [class*="bannerWrap"]{position:absolute;top:0;right:0;z-index:7;background:transparent;border-radius:0}`,
 			`.${CLAUDE_MARKDOWN_SCOPE} [class*="banner"]:not([class*="bannerWrap"]){background:transparent;padding:6px 8px}`,
@@ -4578,6 +4578,7 @@ window.__ModuleLoader__.load({
 			".dsh-claude-transcript-text{color:var(--dsw-alias-label-primary);font-size:15px;line-height:24px;overflow-wrap:anywhere}",
 			".dsh-claude-tool-group-native{overflow:visible}",
 			".dsh-claude-tool-group-native>.dsh-claude-flow-row{padding:0}",
+			".dsh-claude-flow-row .dsh-claude-tool-stats{margin-left:8px}",
 			".dsh-claude-tool-list{max-height:min(420px,calc(100vh - 320px));overflow-x:hidden;overflow-y:auto;overscroll-behavior:contain;margin-top:4px;border:1px solid var(--dsw-alias-border-l1, color-mix(in srgb, currentColor 12%, transparent));border-radius:10px;scrollbar-gutter:stable}",
 			".dsh-claude-tool-item{border-top:1px solid var(--dsw-alias-border-l1, color-mix(in srgb, currentColor 12%, transparent))}",
 			".dsh-claude-tool-item:first-child{border-top:0}",
@@ -4816,13 +4817,36 @@ window.__ModuleLoader__.load({
 			if (!Array.isArray(value)) return [];
 			return value.filter((item) => typeof item === "string");
 		}
+		/** The diff card's chrome, which primitives 0.1.2 moved onto the caller.
+		*
+		*  The card reads `labels.copy` while it builds, so omitting them throws
+		*  mid-render -- and React answers by tearing down the whole conversation, not
+		*  the one tool row.
+		*
+		*  The aria strings deliberately repeat the visible ones: both already say
+		*  exactly what the control does. */
+		function diffBlockLabels(t) {
+			const expand = (hidden) => t("diffCardExpand", { count: hidden });
+			return {
+				copy: t("markdownCopy"),
+				copied: t("markdownCopied"),
+				collapse: t("diffCardCollapse"),
+				collapseAria: t("diffCardCollapse"),
+				expand,
+				expandAria: expand,
+				files: (count) => t("diffCardFiles", { count })
+			};
+		}
 		function ToolPresentation({ tool, t }) {
 			const inputValue = parsedValue(tool.input);
 			const outputValue = parsedValue(tool.output);
 			const input = record$6(inputValue);
 			const output = record$6(outputValue);
 			const outputTitle = tool.isError === true ? t("toolError") : t("toolOutput");
-			if (tool.diffs !== void 0) return /* @__PURE__ */ jsxs(Fragment$1, { children: [/* @__PURE__ */ jsx(DiffBlock, { diffs: [...tool.diffs] }), /* @__PURE__ */ jsx(TextDetail, {
+			if (tool.diffs !== void 0) return /* @__PURE__ */ jsxs(Fragment$1, { children: [/* @__PURE__ */ jsx(DiffBlock, {
+				diffs: [...tool.diffs],
+				labels: diffBlockLabels(t)
+			}), /* @__PURE__ */ jsx(TextDetail, {
 				title: outputTitle,
 				value: typeof outputValue === "string" ? outputValue : void 0
 			})] });
@@ -6555,10 +6579,14 @@ window.__ModuleLoader__.load({
 		const HOST_STAGES = /* @__PURE__ */ new Set([
 			"inspecting",
 			"fetching",
+			"summarizing",
 			"creating-worktree",
 			"saving-worktree",
 			"switching-branch"
 		]);
+		/** The draft only has to describe the work; the host truncates it again before
+		*  summarizing, and the setup route caps the whole body at 16 KiB. */
+		const MAX_INTENT_CHARS = 2e3;
 		function record$3(value) {
 			return typeof value === "object" && value !== null && !Array.isArray(value) ? value : void 0;
 		}
@@ -6594,7 +6622,7 @@ window.__ModuleLoader__.load({
 				throw error;
 			}
 		}
-		async function prepareRepository(cwd, branch, worktree, branchName, onProgress = () => {}) {
+		async function prepareRepository(cwd, branch, worktree, branchName, onProgress = () => {}, intent) {
 			const carrier = new AbortController();
 			try {
 				const reader = await pluginNdjson(CLAUDE_REPOSITORY_SETUP_PATH, carrier.signal, {
@@ -6603,7 +6631,8 @@ window.__ModuleLoader__.load({
 						cwd,
 						branch,
 						worktree,
-						...branchName === void 0 ? {} : { branchName }
+						...branchName === void 0 ? {} : { branchName },
+						...intent === void 0 || intent.trim().length === 0 ? {} : { intent: intent.slice(0, MAX_INTENT_CHARS) }
 					}
 				});
 				const decoder = new TextDecoder();
@@ -6645,6 +6674,12 @@ window.__ModuleLoader__.load({
 			if (body.mode !== "worktree" && body.mode !== "checkout" || typeof body.root !== "string" || typeof body.branch !== "string") throw new Error("Invalid repository cleanup response.");
 			return body;
 		}
+		/** Ask the Host to reconcile worktrees against the workspace registry now.
+		*  Deleting a workspace only touches the registry, so this kick is what makes
+		*  the worktree and its sessions go without waiting out the sweep interval. */
+		async function sweepWorktrees() {
+			await pluginWrite(`${CLAUDE_REPOSITORY_SETUP_PATH}/sweep`, "fast");
+		}
 		/** Lines [from, to] of a working-tree file plus its total line count, for expanding unmodified diff context. */
 		async function loadRepositoryFileLines(cwd, path, from, to, signal) {
 			const body = await pluginRead(CLAUDE_REPOSITORY_FILE_PATH, "git", signal, { query: {
@@ -6892,10 +6927,40 @@ window.__ModuleLoader__.load({
 		const CLAUDE_SCOPED_CSS_VARIABLES = ["--dsh-composer-card-max-width"];
 		/** Marks the bar the scoped-property probe measures. */
 		const CLAUDE_COMPOSER_BAR_ATTRIBUTE = "data-dsh-claude-composer-bar";
-		/** One line per service the Host no longer provides; empty when all resolve. */
-		function claudeBootCheckFindings(input) {
+		/** Methods this plugin calls on the Host services it injects.
+		*
+		*  A service that still resolves but has lost a method is the drift the
+		*  service list above cannot see: Desktop 0.1.2 moved `connectWorkspace` off
+		*  `workspaces` onto a new service, and the worktree flow went on registering
+		*  itself and only broke once a user ran it. Naming the methods here turns
+		*  that into a boot-time line. Methods with a runtime fallback stay out. */
+		const CLAUDE_REQUIRED_SERVICE_METHODS = {
+			sessions: [
+				"scope",
+				"open",
+				"binding"
+			],
+			workspaces: [
+				"create",
+				"delete",
+				"archiveSession"
+			],
+			uiConversation: ["binding"],
+			uiSession: ["provide"],
+			inputTriggers: ["registerSource"]
+		};
+		/** One line per service the Host no longer provides, or provides without a
+		*  method this plugin calls on it; empty when everything resolves. */
+		function claudeBootCheckFindings(input, methods = CLAUDE_REQUIRED_SERVICE_METHODS) {
 			const findings = [];
-			for (const name of input.services) if (input.resolve(name) === void 0) findings.push(`service "${name}" is declared in inject but the Host does not provide it`);
+			for (const name of input.services) {
+				const service = input.resolve(name);
+				if (service === void 0) {
+					findings.push(`service "${name}" is declared in inject but the Host does not provide it`);
+					continue;
+				}
+				for (const method of methods[name] ?? []) if (typeof service[method] !== "function") findings.push(`service "${name}" no longer provides ${method}(); the features calling it are broken`);
+			}
 			return findings;
 		}
 		/** One line per scoped custom property the measured element cannot see.
@@ -7339,6 +7404,14 @@ window.__ModuleLoader__.load({
 				}) : null]
 			});
 		}
+		/** The trigger only shows on a clean branch that is behind its base -- but a
+		*  conflicted rebase leaves the tree dirty on a detached HEAD, so an open
+		*  dialog (and its resolve button) has to outlive that. */
+		function updateBranchMounted(repository, dialogOpen) {
+			const pullRequest = repository.pullRequest;
+			if (pullRequest?.baseBranch === void 0) return false;
+			return dialogOpen || pullRequest.state === "open" && repository.detached !== true && repository.dirty !== true && (repository.baseBehind ?? 0) > 0;
+		}
 		function UpdateBranchControl({ sessionId, repository, t, report, submitPrompt }) {
 			const [dialog, setDialog] = useState();
 			const [method, setMethod] = useState("rebase");
@@ -7347,7 +7420,8 @@ window.__ModuleLoader__.load({
 			const base = pullRequest?.baseBranch;
 			const behind = repository.baseBehind ?? 0;
 			useEffect(() => () => controller.current?.abort(), []);
-			if (pullRequest === void 0 || pullRequest.state !== "open" || base === void 0 || repository.detached === true || repository.dirty === true || behind <= 0) return null;
+			if (pullRequest === void 0 || base === void 0) return null;
+			if (!updateBranchMounted(repository, dialog !== void 0)) return null;
 			const openDialog = () => {
 				controller.current?.abort();
 				setDialog({
@@ -7828,9 +7902,15 @@ window.__ModuleLoader__.load({
 							style: repositoryRemote,
 							children: repositoryName$1(repository.remote)
 						}),
-						/* @__PURE__ */ jsx("span", {
-							style: repositoryBranch,
-							children: branch
+						/* @__PURE__ */ jsx(Tooltip, {
+							label: branch,
+							side: "top",
+							delayMs: 250,
+							maxWidth: 420,
+							children: /* @__PURE__ */ jsx("span", {
+								style: repositoryBranch,
+								children: branch
+							})
 						}),
 						repository.worktree === true ? /* @__PURE__ */ jsx("span", {
 							style: repositoryWorktree,
@@ -8022,7 +8102,9 @@ window.__ModuleLoader__.load({
 						children: comment.text
 					})]
 				}),
-				openDelayMs: 250
+				openDelayMs: 250,
+				copyLabel: t("markdownCopy"),
+				copiedLabel: t("markdownCopied")
 			});
 		}
 		/** Pending review comments docked above the composer; drained by the next user turn. */
@@ -14091,7 +14173,7 @@ window.__ModuleLoader__.load({
 		* @returns the preset id, or undefined when neither source carries one.
 		*/
 		function sessionRowPreset(row) {
-			return row?.agentPreset ?? row?.projectionValues?.agentPreset;
+			return row?.agentPreset ?? row?.projectionValues?.agentPreset ?? void 0;
 		}
 		//#endregion
 		//#region src/client/ClaudePullRequestsPanel.tsx
@@ -15271,13 +15353,37 @@ window.__ModuleLoader__.load({
 		function directChildContaining(parent, descendant) {
 			return Array.from(parent.children).find((child) => child === descendant || child.contains(descendant));
 		}
-		/** Locate rc.8's hero preset seat without relying on hashed CSS module names. */
-		function locateClaudePresetSeat(root = document) {
+		/** The hero's preset buttons: menu buttons without an `aria-label`, which is
+		*  what separates the preset seat from the labelled workspace picker. The
+		*  portal's own branch trigger answers that description too, so it is excluded
+		*  -- counting it made the row look like it held two staged presets from the
+		*  moment these controls mounted. */
+		function heroPresetButtons(root) {
 			const heroes = Array.from(root.querySelectorAll(HERO_SELECTOR));
 			if (heroes.length !== 1) return void 0;
 			const hero = heroes[0];
 			if (hero === void 0) return void 0;
-			const presetButtons = Array.from(hero.querySelectorAll("button[aria-haspopup=\"menu\"]")).filter((button) => button.getAttribute("aria-label") === null && isClaudePresetText(normalizedText(button)));
+			return {
+				hero,
+				presets: Array.from(hero.querySelectorAll("button[aria-haspopup=\"menu\"]")).filter((button) => button.getAttribute("aria-label") === null && button.closest(`[${PORTAL_ATTRIBUTE}]`) === null)
+			};
+		}
+		/** True once the hero has settled on a preset that is not Claude.
+		*  `locateClaudePresetSeat` reports that the same way it reports a hero
+		*  mid-render -- by missing -- so without this the retention rule below reads a
+		*  deliberate switch away from Claude as a re-render and leaves the controls up. */
+		function showsOtherPresetSeat(root = document) {
+			const found = heroPresetButtons(root);
+			if (found === void 0 || found.presets.length !== 1) return false;
+			const preset = found.presets[0];
+			return preset !== void 0 && !isClaudePresetText(normalizedText(preset));
+		}
+		/** Locate rc.8's hero preset seat without relying on hashed CSS module names. */
+		function locateClaudePresetSeat(root = document) {
+			const found = heroPresetButtons(root);
+			if (found === void 0) return void 0;
+			const { hero } = found;
+			const presetButtons = found.presets.filter((button) => isClaudePresetText(normalizedText(button)));
 			if (presetButtons.length !== 1) return void 0;
 			const preset = presetButtons[0];
 			if (preset === void 0) return void 0;
@@ -15322,10 +15428,15 @@ window.__ModuleLoader__.load({
 		}
 		//#endregion
 		//#region src/client/ClaudeHeroRepositoryControls.tsx
+		/** The host composer was a textarea through rc.8 and is a Lexical
+		*  contenteditable from 0.1.2 on, so match the composer seat rather than the
+		*  element type: an element-type check silently stops intercepting Enter, and
+		*  the capsule's branch and Worktree choices go nowhere. */
 		function shouldInterceptKey(event) {
 			if (event.key !== "Enter" || event.shiftKey || event.repeat || event.isComposing) return false;
 			const target = event.target;
-			return target instanceof HTMLTextAreaElement && target.closest("[data-phase=\"hero\"]") !== null;
+			if (!(target instanceof Element)) return false;
+			return target.closest("textarea, [data-composer-input]") !== null && target.closest("[data-phase=\"hero\"]") !== null;
 		}
 		function shouldInterceptClick(event) {
 			const target = event.target;
@@ -15361,6 +15472,7 @@ window.__ModuleLoader__.load({
 		const WORKTREE_PROGRESS_STAGES = [
 			"inspecting",
 			"fetching",
+			"summarizing",
 			"creating-worktree",
 			"saving-worktree",
 			"creating-workspace",
@@ -15371,6 +15483,7 @@ window.__ModuleLoader__.load({
 		const PROGRESS_LABEL_KEYS = {
 			inspecting: "repositoryProgress_inspecting",
 			fetching: "repositoryProgress_fetching",
+			summarizing: "repositoryProgress_summarizing",
 			"creating-worktree": "repositoryProgress_creating-worktree",
 			"saving-worktree": "repositoryProgress_saving-worktree",
 			"switching-branch": "repositoryProgress_switching-branch",
@@ -15729,7 +15842,7 @@ window.__ModuleLoader__.load({
 					scheduled = false;
 					const target = locateClaudePresetSeat();
 					if (target === void 0) {
-						if (retainsClaudeHeroPortal(current)) return;
+						if (retainsClaudeHeroPortal(current) && !showsOtherPresetSeat()) return;
 						current = void 0;
 						removeClaudeHeroPortals();
 						setPortal(void 0);
@@ -17050,6 +17163,7 @@ window.__ModuleLoader__.load({
 			repositoryProgressDismiss: "关闭 Worktree 进度",
 			repositoryProgress_inspecting: "检查仓库和分支",
 			repositoryProgress_fetching: "刷新远程引用",
+			repositoryProgress_summarizing: "总结需求生成分支名",
 			"repositoryProgress_creating-worktree": "创建分支和 Worktree",
 			"repositoryProgress_saving-worktree": "保存 Worktree 状态",
 			"repositoryProgress_switching-branch": "切换本地分支",
@@ -17107,6 +17221,9 @@ window.__ModuleLoader__.load({
 			diffCommentNext: "下一条评论",
 			diffCommentPosition: "第 {index} 条，共 {total} 条",
 			diffCommentCounter: "{index}/{total}",
+			diffCardExpand: "展开其余 {count} 行",
+			diffCardCollapse: "收起",
+			diffCardFiles: "{count} 个文件",
 			diffExpandAll: "展开全部文件",
 			diffCollapseAll: "收起全部文件",
 			diffRestore: "还原 Diff 面板",
@@ -17423,6 +17540,7 @@ window.__ModuleLoader__.load({
 			repositoryProgressDismiss: "Dismiss Worktree progress",
 			repositoryProgress_inspecting: "Checking repository and branch",
 			repositoryProgress_fetching: "Refreshing remote references",
+			repositoryProgress_summarizing: "Naming the branch after the request",
 			"repositoryProgress_creating-worktree": "Creating branch and Worktree",
 			"repositoryProgress_saving-worktree": "Saving Worktree state",
 			"repositoryProgress_switching-branch": "Switching local branch",
@@ -17480,6 +17598,9 @@ window.__ModuleLoader__.load({
 			diffCommentNext: "Next comment",
 			diffCommentPosition: "Comment {index} of {total}",
 			diffCommentCounter: "{index}/{total}",
+			diffCardExpand: "Show {count} more lines",
+			diffCardCollapse: "Show less",
+			diffCardFiles: "{count} files",
 			diffExpandAll: "Expand all files",
 			diffCollapseAll: "Collapse all files",
 			diffRestore: "Restore diff panel",
@@ -17680,6 +17801,17 @@ window.__ModuleLoader__.load({
 			"conversation",
 			"connection"
 		];
+		/** Resolve one session's composer facade.
+		*
+		*  `sessions.scope()` returns the client runtime's AgentContext, and the
+		*  conversation package -- a release ahead of the runtime in the graph the Host
+		*  itself ships -- types `input.for` against a Context whose `remote` has since
+		*  gained `$stream` and `$host`. It is the same object at runtime; only the two
+		*  declarations disagree, and they disagree inside the Host too, so the cast
+		*  lives here once instead of at all nine call sites. */
+		function sessionInput(conversation, scope) {
+			return conversation.input.for(scope);
+		}
 		function apply(ctx) {
 			const namespace = "settings.claude-code";
 			const diagnostics = createClaudeDiagnosticsReporter();
@@ -17705,6 +17837,17 @@ window.__ModuleLoader__.load({
 			ctx.effect(() => ctx.inputTriggers.registerSource(createClaudeCommandSource(ctx, projections)), "dsh-claude: Claude slash source");
 			const sessions = ctx.get("sessions");
 			const workspaces = ctx.get("workspaces");
+			const uiWorkspace = ctx.get("uiWorkspace");
+			const connectWorkspace = uiWorkspace?.connectWorkspace?.bind(uiWorkspace) ?? (typeof workspaces?.connectWorkspace === "function" ? workspaces.connectWorkspace.bind(workspaces) : void 0);
+			if (workspaces !== void 0) ctx.effect(() => {
+				let known = new Set(workspaces.list.getSnapshot().items.map((item) => item.workspaceId));
+				return workspaces.list.subscribe(() => {
+					const next = new Set(workspaces.list.getSnapshot().items.map((item) => item.workspaceId));
+					const removed = [...known].some((id) => !next.has(id));
+					known = next;
+					if (removed) sweepWorktrees().catch(() => void 0);
+				});
+			}, "dsh-claude: worktree sweep on workspace deletion");
 			const conversation = ctx.get("conversation");
 			const connection = ctx.get("connection");
 			const remote = ctx.get("remote");
@@ -17716,7 +17859,7 @@ window.__ModuleLoader__.load({
 				return (draft, mode = "append") => {
 					const scope = sessions.scope(sessionId);
 					if (scope === void 0) return false;
-					const input = conversation.input.for(scope);
+					const input = sessionInput(conversation, scope);
 					const current = input.state.getSnapshot().draft;
 					if (current.trim() === "") input.setDraft(draft);
 					else if (mode === "append") input.setDraft(`${current}\n\n${draft}`);
@@ -17962,7 +18105,7 @@ window.__ModuleLoader__.load({
 					...sessions === void 0 || conversation === void 0 ? {} : { submitWith: (fallbackDraft) => {
 						const scope = sessions.scope(sessionId);
 						if (scope === void 0) return;
-						const input = conversation.input.for(scope);
+						const input = sessionInput(conversation, scope);
 						if (input.state.getSnapshot().draft.trim() === "") input.setDraft(fallbackDraft);
 						input.submit();
 					} }
@@ -18000,7 +18143,7 @@ window.__ModuleLoader__.load({
 				...sessions === void 0 || conversation === void 0 ? {} : { insertIntoChat: (sessionId, text) => {
 					const scope = sessions.scope(sessionId);
 					if (scope === void 0) return;
-					const input = conversation.input.for(scope);
+					const input = sessionInput(conversation, scope);
 					const current = input.state.getSnapshot().draft;
 					input.setDraft(current.trim() === "" ? text : `${current}\n\n${text}`);
 				} }
@@ -18062,7 +18205,7 @@ window.__ModuleLoader__.load({
 					...conversation === void 0 ? {} : { setDraft: (sessionId, text) => {
 						const scope = sessions.scope(sessionId);
 						if (scope === void 0) return;
-						conversation.input.for(scope).setDraft(text);
+						sessionInput(conversation, scope).setDraft(text);
 					} }
 				};
 				ctx.slots.inject("shell.overlay", () => ctx.slots.register({
@@ -18084,12 +18227,12 @@ window.__ModuleLoader__.load({
 						t,
 						updateQueue: (itemId, action) => target.updateQueue(itemId, action),
 						notify: (level, text) => {
-							if (scope !== void 0) conversation.input.for(scope).notify(level, text);
+							if (scope !== void 0) sessionInput(conversation, scope).notify(level, text);
 						}
 					};
 				}
 			}, ClaudeQueueDock));
-			if (sessions !== void 0 && workspaces !== void 0 && conversation !== void 0 && connection !== void 0 && remote !== void 0) {
+			if (sessions !== void 0 && workspaces !== void 0 && connectWorkspace !== void 0 && conversation !== void 0 && connection !== void 0 && remote !== void 0) {
 				/** Attach a prepared worktree to its session without blocking the flow. */
 				const bindLease = (leaseId, targetSessionId) => {
 					if (leaseId === void 0) return;
@@ -18107,11 +18250,11 @@ window.__ModuleLoader__.load({
 						prepare: async (cwd, branch, useWorktree, onProgress, ticket) => {
 							const sourceScope = sessions.scope(sourceSessionId);
 							if (sourceScope === void 0) throw new Error(t("repositorySessionUnavailable"));
-							const sourceInput = conversation.input.for(sourceScope);
+							const sourceInput = sessionInput(conversation, sourceScope);
 							const rawDraft = sourceInput.state.getSnapshot().draft;
 							const draft = ticket === void 0 ? rawDraft : rawDraft.trim() === "" ? ticketPrompt(ticket) : `${rawDraft.trimEnd()}\n\n${ticketContext(ticket)}`;
 							const imageIds = sourceInput.state.getSnapshot().imageIds;
-							const prepared = await prepareRepository(cwd, branch, useWorktree, ticket?.key, onProgress);
+							const prepared = await prepareRepository(cwd, branch, useWorktree, ticket?.key, onProgress, ticket === void 0 ? draft : void 0);
 							if (ticket !== void 0) assignJiraTicket(ticket.key).catch((reason) => {
 								console.warn(`dsh-claude: could not assign ${ticket.key}: ${reason instanceof Error ? reason.message : String(reason)}`);
 							});
@@ -18123,13 +18266,13 @@ window.__ModuleLoader__.load({
 							onProgress("creating-workspace");
 							const workspace = await workspaces.create({ path: prepared.path });
 							onProgress("starting-session");
-							const targetSessionId = await workspaces.connectWorkspace(workspace.workspaceId);
+							const targetSessionId = await connectWorkspace(workspace.workspaceId);
 							const targetScope = sessions.scope(targetSessionId);
 							if (targetScope === void 0) throw new Error(t("repositorySessionUnavailable"));
 							const presetResponse = await remote.agentPresets.select(targetSessionId, "claude");
 							if (!presetResponse.ok) throw new Error(presetResponse.error.message);
-							sessions.noteAgentPreset(targetSessionId, presetResponse.value);
-							const targetInput = conversation.input.for(targetScope);
+							sessions.noteAgentPreset?.(targetSessionId, presetResponse.value);
+							const targetInput = sessionInput(conversation, targetScope);
 							onProgress("transferring-draft");
 							if (imageIds.length > 0 && !targetInput.addImages(imageIds)) throw new Error(t("repositoryDraftTransferFailed"));
 							if (draft !== "") targetInput.setDraft(draft);
@@ -18143,7 +18286,7 @@ window.__ModuleLoader__.load({
 						prepareMany: async (cwd, branch, tickets, onProgress) => {
 							const sourceScope = sessions.scope(sourceSessionId);
 							if (sourceScope === void 0) throw new Error(t("repositorySessionUnavailable"));
-							const sourceInput = conversation.input.for(sourceScope);
+							const sourceInput = sessionInput(conversation, sourceScope);
 							const rawDraft = sourceInput.state.getSnapshot().draft;
 							const failures = [];
 							for (const [index, ticket] of tickets.entries()) {
@@ -18164,13 +18307,13 @@ window.__ModuleLoader__.load({
 									report("creating-workspace");
 									const workspace = await workspaces.create({ path: prepared.path });
 									report("starting-session");
-									const targetSessionId = await workspaces.connectWorkspace(workspace.workspaceId);
+									const targetSessionId = await connectWorkspace(workspace.workspaceId);
 									const targetScope = sessions.scope(targetSessionId);
 									if (targetScope === void 0) throw new Error(t("repositorySessionUnavailable"));
 									const presetResponse = await remote.agentPresets.select(targetSessionId, "claude");
 									if (!presetResponse.ok) throw new Error(presetResponse.error.message);
-									sessions.noteAgentPreset(targetSessionId, presetResponse.value);
-									const targetInput = conversation.input.for(targetScope);
+									sessions.noteAgentPreset?.(targetSessionId, presetResponse.value);
+									const targetInput = sessionInput(conversation, targetScope);
 									report("transferring-draft");
 									targetInput.setDraft(rawDraft.trim() === "" ? ticketPrompt(ticket) : `${rawDraft.trimEnd()}\n\n${ticketContext(ticket)}`);
 									bindLease(prepared.leaseId, targetSessionId);