diff --git a/packages/server/src/server/session.ts b/packages/server/src/server/session.ts
index b742e2d54..2c5c6c3f5 100644
--- a/packages/server/src/server/session.ts
+++ b/packages/server/src/server/session.ts
@@ -6115,7 +6115,7 @@ export class Session {
   }
 
   async getAvailableEditorTargets() {
-    return this.filterEditorsForClient(listAvailableEditorTargets());
+    return this.filterEditorsForClient(await listAvailableEditorTargets());
   }
 
   async openEditorTarget(options: { editorId: EditorTargetId; path: string }): Promise<void> {
@@ -7543,7 +7543,9 @@ export class Session {
         listStoredAgents: () => this.agentStorage.list(),
         listLiveAgents: () => this.agentManager.listAgents(),
         resolveAgentIdentifier: (identifier) => this.resolveAgentIdentifier(identifier),
-        sendAgentMessage: (agentId, text) => this.handleSendAgentMessage(agentId, text),
+        sendAgentMessage: async (agentId, text) => {
+          await this.handleSendAgentMessage(agentId, text);
+        },
       });
     } catch (error) {
       this.emitChatRpcError(request, error);
diff --git a/packages/server/src/shared/messages.ts b/packages/server/src/shared/messages.ts
index 901830179..1d89d5bea 100644
--- a/packages/server/src/shared/messages.ts
+++ b/packages/server/src/shared/messages.ts
@@ -1097,7 +1097,7 @@ export const CreatePaseoWorktreeRequestSchema = z.object({
   requestId: z.string(),
 });
 
-// TODO: Remove once most clients are on >=0.1.50 and support arbitrary editor ids.
+// TODO(2026-07): Remove once most clients are on >=0.1.50 and support arbitrary editor ids.
 export const LEGACY_EDITOR_TARGET_IDS = [
   "cursor",
   "vscode",