cartethyia 2.7.9 → 2.8.1

package/src/providers/integrations/cursor/cursor-request.ts

@@ -219,7 +219,9 @@ export function systemPromptFrom(request: CanonicalRequest): string | undefined
  */
 export function historyFromRequest(request: CanonicalRequest): CursorHistoryEntry[] {
   const entries: CursorHistoryEntry[] = [];
-  for (const message of request.messages) {
+  const liveIndex = lastLiveUserMessageIndex(request);
+  for (const [index, message] of request.messages.entries()) {
+    if (index === liveIndex) continue;
     const text = messageText(message);
     if (text.trim().length === 0) continue;
     if (message.role === "assistant") entries.push({ role: "assistant", content: text });
@@ -235,9 +237,6 @@ export function buildRunRequest(input: {
   readonly text: string;
   readonly modelId: string;
   readonly conversationId: string;
-  /** Stable parent group; unlike the conversation id it survives a rebase. */
-  readonly conversationGroupId?: string;
-  readonly runId?: string;
   readonly messageId?: string;
   readonly history?: readonly CursorHistoryEntry[];
   /** Cursor-declared parameter tuple (effort/context/fast) for this model. */
@@ -277,12 +276,17 @@ export function buildRunRequest(input: {
   userMessageAction["request_context"] = requestContext;
   const runRequest: Record<string, unknown> = {
     conversation_id: input.conversationId,
-    conversation_group_id: input.conversationGroupId ?? input.conversationId,
-    run_id: input.runId ?? messageId,
     action:
       input.action === "resume"
         ? { resume_action: { request_context: requestContext } }
         : { user_message_action: userMessageAction },
+    // `model_details` (#3) carries the safe wire id; `requested_model` (#9)
+    // carries the parameter tuple. Matches `agent.proto` exactly — the old
+    // schema invented extra fields that have no wire meaning.
+    model_details: {
+      model_id: input.modelId,
+      max_mode: input.maxMode ?? false,
+    },
     requested_model: {
       model_id: input.modelId,
       max_mode: input.maxMode ?? false,
@@ -290,8 +294,6 @@ export function buildRunRequest(input: {
     },
     conversation_state: seeded ? buildSeedConversationState() : input.conversationState,
     mcp_tools: { mcp_tools: [] },
-    unknown_flag: 0,
-    field_12: 0,
   };
   return encodeMessage("AgentClientMessage", { run_request: runRequest });
 }
@@ -309,9 +311,12 @@ export function buildExecStreamClose(execId: number, execIdString?: string): Uin
 }
 
 /** Stops the live Run, as Cursor CLI does before closing the stream. */
-export function buildCancelAction(reason: string): Uint8Array {
+export function buildCancelAction(_reason: string): Uint8Array {
+  // `agent.proto` CancelAction is empty — the oneof presence is the signal,
+  // and the reason travels out-of-band (stream close). Sending a `reason`
+  // field would encode bytes the server does not expect.
   return encodeMessage("AgentClientMessage", {
-    conversation_action: { cancel_action: { reason } },
+    conversation_action: { cancel_action: {} },
   });
 }
 
@@ -530,12 +535,21 @@ function toolResultText(part: Extract<ContentPart, { kind: "toolResult" }>): str
  * only the current prompt.
  */
 export function liveUserText(request: CanonicalRequest): string {
+  const index = lastLiveUserMessageIndex(request);
+  if (index === -1) return "";
+  const message = request.messages[index];
+  if (message === undefined) return "";
+  return messageText(message);
+}
+
+/** Index of the current user/tool turn Cursor should send as the live prompt. */
+function lastLiveUserMessageIndex(request: CanonicalRequest): number {
   for (let index = request.messages.length - 1; index >= 0; index -= 1) {
     const message = request.messages[index];
     if (message === undefined) continue;
     if (message.role !== "user" && message.role !== "tool") continue;
     const text = messageText(message);
-    if (text.trim().length > 0) return text;
+    if (text.trim().length > 0) return index;
   }
-  return "";
+  return -1;
 }

package/src/providers/integrations/cursor/cursor-shared.ts

@@ -33,7 +33,7 @@ export const CURSOR_OAUTH_CLIENT_ID = "KbZUR41cY7W6zRSdpSUJ7I7mLYBKOCmB";
  * operator was not what the request carried. Discovery supersedes both on its
  * first successful fetch.
  */
-export const FALLBACK_CLIENT_VERSION = "cli-3.29.9-306d153";
+export const FALLBACK_CLIENT_VERSION = "cli-3.29.15-86776fc";
 
 /** Connect-RPC paths. Run is served by the discovered agent origin, not the API host. */
 export const RUN_PATH = "/agent.v1.AgentService/Run";
@@ -83,11 +83,14 @@ export const SESSION_REFRESH_TIMEOUT_MS = 20_000;
 
 /**
  * How long a live Cursor Run is held open waiting for the client's next
- * tool-result request. Matches the donor's continuation default: a tool round
- * the client never answers must not hold an HTTP/2 stream, an account lease, or
- * a pool slot for the life of the process.
+ * tool-result request. Matches the donor's relay hold (`CURSOR_RELAY_IDLE_
+ * TIMEOUT_MS` in oh-my-pi: 30 minutes): a tool round the client never answers
+ * must not hold an HTTP/2 stream, an account lease, or a pool slot for the life
+ * of the process, but a human-approved tool round often takes longer than ten
+ * minutes — a shorter TTL expired the Run mid-approval and forced the client to
+ * resend the whole conversation.
  */
-export const RUN_IDLE_TTL_MS = 10 * 60_000;
+export const RUN_IDLE_TTL_MS = 30 * 60_000;
 
 /**
  * Any HTTPS subdomain of `cursor.sh` is an acceptable Run host: the region