arul28 · arul28 · Sep 15, 2026 · Sep 15, 2026 · Sep 15, 2026 · Sep 15, 2026
@@ -3415,6 +3415,7 @@ describe("adeRpcServer", () => {
       body: "Body text",
       draft: true,
       closeLinearIssueOnMerge: true,
+      source: "agent",
     });
 
     const defaulted = await callTool(handler, "create_pr_from_lane", {
@@ -3430,6 +3431,7 @@ describe("adeRpcServer", () => {
       body: "",
       draft: false,
       closeLinearIssueOnMerge: true,
+      source: "agent",
     });
 
     (fixture.runtime.laneService.list as any).mockResolvedValueOnce([
@@ -3471,6 +3473,7 @@ describe("adeRpcServer", () => {
       body: "",
       draft: false,
       closeLinearIssueOnMerge: true,
+      source: "agent",
     });
 
     const updateTitle = await callTool(handler, "pr_update_title", { prId: "pr-1", title: "Renamed" });

@@ -1043,6 +1043,7 @@ const TOOL_SPECS: ToolSpec[] = [
         body: { type: "string" },
         draft: { type: "boolean", default: false },
         closeLinearIssueOnMerge: { type: "boolean", default: true },
+        sessionId: { type: "string", minLength: 1 },
       }
     }
   },
@@ -5512,11 +5513,15 @@ async function runTool(args: {
     if (!title) title = await defaultPrTitleForLane(runtime, laneId, baseBranch);
     if (body == null) body = "";
     const draft = asBoolean(toolArgs.draft, false);
+    const sessionId = asOptionalTrimmedString(toolArgs.sessionId)
+      ?? asOptionalTrimmedString(session.identity.chatSessionId);
     const pr = await prSvc.createFromLane({
       laneId,
       title,
       body,
       draft,
+      source: "agent",
+      ...(sessionId ? { sessionId } : {}),
       ...(baseBranch ? { baseBranch } : {}),
       ...(closeLinearIssueOnMerge ? { closeLinearIssueOnMerge } : {}),
     });

@@ -182,7 +182,7 @@ import { createPushRegistrationStore } from "./services/push/pushRegistrationSto
 import { createPushRelayClient } from "./services/push/pushRelayClient";
 import { getSharedPushPublisherService, resolvePushRelayStateFile, type PushPrNotification, type PushPublisherDeps, type PushPublisherService } from "./services/push/pushPublisherService";
 import type { createFileService } from "../../desktop/src/main/services/files/fileService";
-import type { AppNavigationRequest, AppNavigationResult, PortLease, SyncRoleSnapshot } from "../../desktop/src/shared/types";
+import type { AppNavigationRequest, AppNavigationResult, PortLease, SyncRoleSnapshot, PrSummary } from "../../desktop/src/shared/types";
 import type { PrEventPayload } from "../../desktop/src/shared/types/prs";
 import {
   createAutomationService,
@@ -227,6 +227,7 @@ export async function emitRuntimePrCardsForChanges(args: {
   dataSource: PrCardDataSource;
   chat: Partial<PrCardChatSink> | null;
   logger: Pick<Logger, "warn">;
+  relatedPrs?: PrSummary[];
 }): Promise<void> {
   const { chat } = args;
   if (
@@ -242,6 +243,7 @@ export async function emitRuntimePrCardsForChanges(args: {
         change,
         dataSource: args.dataSource,
         chat: chat as PrCardChatSink,
+        relatedPrs: args.relatedPrs,
       });
     } catch (error) {
       args.logger.warn("prs.chat_card_emit_failed", {
@@ -1869,7 +1871,7 @@ export async function createAdeRuntime(args: {
       onEvent: emitPrEvent,
       onPullRequestsSnapshot: (snapshot) =>
         prMergeAutoSettlementService.processSnapshot(snapshot),
-      onPullRequestsChanged: async ({ changedPrs, changes }) => {
+      onPullRequestsChanged: async ({ prs, changedPrs, changes }) => {
         if (changedPrs.length > 0) {
           // Poll results must not start another hot-refresh window; doing so
           // turns active CI into an unbounded high-frequency GitHub API loop.
@@ -1888,6 +1890,7 @@ export async function createAdeRuntime(args: {
           dataSource: headlessLinearServices.prService,
           chat: agentChatService,
           logger,
+          relatedPrs: prs,
         });
       },
     });

@@ -2493,6 +2493,11 @@ const HELP_BY_COMMAND: Record<string, string> = {
     $ ade prs stacks create --pulls 12,13,14        Create a stack, ordered bottom to top
     $ ade prs stacks add --stack 8 --pulls 15       Add pull requests above the current stack top
     $ ade prs stacks unstack --stack 8              Remove eligible pull requests from a GitHub stack
+    $ ade prs stacks merge --stack 8 --method squash
+                                                    Merge every open stack layer through GitHub
+    $ ade prs stacks rebase --stack 8               Rebase every open stack layer onto the layer below
+    $ ade prs link-chat --pr <pr> --session <id>    Link a pull request to a chat
+    $ ade prs unlink-chat --pr <pr> --session <id>  Unlink a pull request from a chat (does not revive as fallback)
     $ ade prs resolve-thread <pr> --thread <id>     Resolve a review thread
     $ ade prs labels set <pr> ready-to-merge        Replace labels
     $ ade prs reviewers request <pr> alice bob      Request reviewers
@@ -7297,6 +7302,29 @@ function buildPrPlan(args: string[]): CliPlan {
       ],
     };
   }
+  if (sub === "link-chat" || sub === "unlink-chat") {
+    const sessionId = requireValue(readValue(args, ["--session", "--session-id", "--chat"]), "sessionId");
+    const linkedPrId = requireValue(
+      prId ?? readValue(args, ["--pr", "--pr-id"]) ?? firstPositional(args),
+      "prId",
+    );
+    const input: JsonObject = { prId: linkedPrId, sessionId };
+    if (sub === "link-chat" && readFlag(args, ["--cross-lane", "--allow-cross-lane"])) {
+      input.allowCrossLane = true;
+    }
+    return {
+      kind: "execute",
+      label: sub === "link-chat" ? "PR link chat" : "PR unlink chat",
+      steps: [
+        actionStep(
+          "result",
+          "pr",
+          sub === "link-chat" ? "linkChatSession" : "unlinkChatSession",
+          collectGenericObjectArgs(args, input),
+        ),
+      ],
+    };
+  }
 
   const scalarPrActions: Record<string, string> = {
     status: "getStatus",
@@ -7691,7 +7719,36 @@ function buildPrPlan(args: string[]): CliPlan {
         ],
       };
     }
-    throw new CliUsageError("prs stacks supports list, sync, create, add, and unstack.");
+    if (mode === "merge") {
+      const mergeMethod = readValue(args, ["--method", "--merge-method"]) ?? "squash";
+      if (mergeMethod !== "merge" && mergeMethod !== "squash" && mergeMethod !== "rebase") {
+        throw new CliUsageError("prs stacks merge --method must be merge, squash, or rebase.");
+      }
+      return {
+        kind: "execute",
+        label: "GitHub stack merge",
+        steps: [
+          actionStep("result", "pr", "mergeGithubStack", {
+            ...repoArgs,
+            stackNumber,
+            mergeMethod,
+          }),
+        ],
+      };
+    }
+    if (mode === "rebase") {
+      return {
+        kind: "execute",
+        label: "GitHub stack rebase",
+        steps: [
+          actionStep("result", "pr", "rebaseGithubStack", {
+            ...repoArgs,
+            stackNumber,
+          }),
+        ],
+      };
+    }
+    throw new CliUsageError("prs stacks supports list, sync, create, add, unstack, merge, and rebase.");
   }
   if (sub === "conflicts") {
     const mode = firstPositional(args) ?? "list";

@@ -6346,6 +6346,13 @@ describe("CTO-gated Linear sync commands", () => {
         "prs.createGithubStack",
         "prs.addGithubStackPullRequests",
         "prs.unstackGithubStack",
+        "prs.mergeGithubStack",
+        "prs.rebaseGithubStack",
+        "prs.linkChatSession",
+        "prs.unlinkChatSession",
+        "prs.linkChatStack",
+        "prs.listChatSessionsForPr",
+        "prs.getStackLinkOffer",
         "ai.openCursorCloudChat",
         "ai.watchCursorCloudMirror",
         "ai.cursorCloudFleet",

@@ -274,6 +274,8 @@ describe("createSyncRemoteCommandService", () => {
       "prs.getComments",
       "prs.getFiles",
       "prs.getGitHubSnapshot",
+      "prs.getStackLinkOffer",
+      "prs.listChatSessionsForPr",
       "prs.listGithubStacks",
       "prs.getReviewThreads",
       "prs.getActionRuns",

@@ -172,6 +172,13 @@ import type {
   StartIntegrationResolutionArgs,
   SubmitPrReviewArgs,
   UnstackGitHubPrStackArgs,
+  MergeGitHubPrStackArgs,
+  RebaseGitHubPrStackArgs,
+  GitHubStackMutationResult,
+  LinkPrChatSessionArgs,
+  LinkPrChatStackArgs,
+  UnlinkPrChatSessionArgs,
+  ListPrChatSessionsArgs,
   ExternalSessionImportArgs,
   ExternalSessionImportResult,
   ExternalSessionListArgs,
@@ -3294,6 +3301,74 @@ function parseUnstackGithubStackArgs(
   };
 }
 
+function parseMergeGithubStackArgs(value: Record<string, unknown>): MergeGitHubPrStackArgs {
+  const repo = parseGithubStackRepo(value, "prs.mergeGithubStack");
+  const stackNumber = asOptionalNumber(value.stackNumber);
+  if (stackNumber == null || !Number.isInteger(stackNumber) || stackNumber <= 0) {
+    throw new Error("prs.mergeGithubStack requires a positive integer stackNumber.");
+  }
+  const mergeMethod = asTrimmedString(value.mergeMethod);
+  if (
+    mergeMethod
+    && mergeMethod !== "merge"
+    && mergeMethod !== "squash"
+    && mergeMethod !== "rebase"
+  ) {
+    throw new Error("prs.mergeGithubStack mergeMethod must be merge, squash, or rebase.");
+  }
+  return {
+    ...(repo ? { repo } : {}),
+    stackNumber,
+    ...(mergeMethod ? { mergeMethod } : {}),
+  };
+}
+
+function parseRebaseGithubStackArgs(value: Record<string, unknown>): RebaseGitHubPrStackArgs {
+  const repo = parseGithubStackRepo(value, "prs.rebaseGithubStack");
+  const stackNumber = asOptionalNumber(value.stackNumber);
+  if (stackNumber == null || !Number.isInteger(stackNumber) || stackNumber <= 0) {
+    throw new Error("prs.rebaseGithubStack requires a positive integer stackNumber.");
+  }
+  return {
+    ...(repo ? { repo } : {}),
+    stackNumber,
+  };
+}
+
+function parseLinkPrChatSessionArgs(value: Record<string, unknown>): LinkPrChatSessionArgs {
+  return {
+    prId: requireString(value.prId, "prs.linkChatSession requires prId."),
+    sessionId: requireString(value.sessionId, "prs.linkChatSession requires sessionId."),
+    ...(value.allowCrossLane === true ? { allowCrossLane: true } : {}),
+  };
+}
+
+function parseLinkPrChatStackArgs(value: Record<string, unknown>): LinkPrChatStackArgs {
+  const stackNumber = asOptionalNumber(value.stackNumber);
+  if (stackNumber == null || !Number.isInteger(stackNumber) || stackNumber <= 0) {
+    throw new Error("prs.linkChatStack requires a positive integer stackNumber.");
+  }
+  return {
+    sessionId: requireString(value.sessionId, "prs.linkChatStack requires sessionId."),
+    stackNumber,
+    ...(asTrimmedString(value.prId) ? { prId: asTrimmedString(value.prId) } : {}),
+  };
+}
+
+function parseUnlinkPrChatSessionArgs(value: Record<string, unknown>): UnlinkPrChatSessionArgs {
+  return {
+    prId: requireString(value.prId, "prs.unlinkChatSession requires prId."),
+    sessionId: requireString(value.sessionId, "prs.unlinkChatSession requires sessionId."),
+    ...(value.dismiss === false ? { dismiss: false } : {}),
+  };
+}
+
+function parseListPrChatSessionsArgs(value: Record<string, unknown>): ListPrChatSessionsArgs {
+  return {
+    prId: requireString(value.prId, "prs.listChatSessionsForPr requires prId."),
+  };
+}
+
 function parseCreatePrArgs(value: Record<string, unknown>): CreatePrFromLaneArgs {
   const laneId = asTrimmedString(value.laneId);
   const title = asTrimmedString(value.title);
@@ -3314,6 +3389,7 @@ function parseCreatePrArgs(value: Record<string, unknown>): CreatePrFromLaneArgs
     ...(typeof value.allowDirtyWorktree === "boolean" ? { allowDirtyWorktree: value.allowDirtyWorktree } : {}),
     ...(typeof value.closeLinearIssueOnMerge === "boolean" ? { closeLinearIssueOnMerge: value.closeLinearIssueOnMerge } : {}),
     ...(strategy ? { strategy } : {}),
+    ...(value.source === "agent" || value.source === "human" ? { source: value.source } : {}),
   };
 }
 
@@ -5902,6 +5978,23 @@ function registerPrAndDeeplinkRemoteCommands({ args, register }: RemoteCommandRe
     args.prService.addGithubStackPullRequests(parseAddGithubStackPullRequestsArgs(payload)));
   register("prs.unstackGithubStack", { viewerAllowed: true, queueable: true }, async (payload) =>
     args.prService.unstackGithubStack(parseUnstackGithubStackArgs(payload)));
+  register("prs.mergeGithubStack", { viewerAllowed: true, queueable: true }, async (payload) =>
+    args.prService.mergeGithubStack(parseMergeGithubStackArgs(payload)));
+  register("prs.rebaseGithubStack", { viewerAllowed: true, queueable: true }, async (payload) =>
+    args.prService.rebaseGithubStack(parseRebaseGithubStackArgs(payload)));
+  register("prs.linkChatSession", { viewerAllowed: true, queueable: true }, async (payload) =>
+    args.prService.linkChatSession(parseLinkPrChatSessionArgs(payload)));
+  register("prs.unlinkChatSession", { viewerAllowed: true, queueable: true }, async (payload) =>
+    args.prService.unlinkChatSession(parseUnlinkPrChatSessionArgs(payload)));
+  register("prs.linkChatStack", { viewerAllowed: true, queueable: true }, async (payload) =>
+    args.prService.linkChatStack(parseLinkPrChatStackArgs(payload)));
+  register("prs.listChatSessionsForPr", { viewerAllowed: true, observesAbort: true }, async (payload) =>
+    args.prService.listChatSessionsForPr(parseListPrChatSessionsArgs(payload)));
+  register("prs.getStackLinkOffer", { viewerAllowed: true, observesAbort: true }, async (payload) =>
+    args.prService.getStackLinkOffer({
+      sessionId: requireString(payload.sessionId, "prs.getStackLinkOffer requires sessionId."),
+      prId: asTrimmedString(payload.prId) || null,
+    }));
   register("prs.linkToLane", { viewerAllowed: true, queueable: true }, async (payload) => args.prService.linkToLane(parseLinkPrToLaneArgs(payload)));
   register("prs.preflightCreateLaneFromPrBranch", { viewerAllowed: true, observesAbort: true }, async (payload) => args.prService.preflightCreateLaneFromPrBranch(parseCreateLaneFromPrBranchArgs(payload)));
   register("prs.createLaneFromPrBranch", { viewerAllowed: true, queueable: true }, async (payload) => args.prService.createLaneFromPrBranch(parseCreateLaneFromPrBranchArgs(payload)));

@@ -45,6 +45,16 @@ describe("Header", () => {
     expect(frame.match(/ADE/g)).toHaveLength(1);
   });
 
+  it("shows the compact linked PR chip next to the chat title", () => {
+    const result = render(
+      <Header projectName="ADE" lane={null} prLabel="#42 +1" />,
+    );
+    const frame = stripAnsi(result.lastFrame() ?? "");
+
+    expect(frame).toContain("pr ");
+    expect(frame).toContain("#42 +1");
+  });
+
   it("shows concise lane and branch context without model details", () => {
     const result = render(<Header projectName="Project" lane={lane()} chatTitle="Design pass" />);
     const frame = stripAnsi(result.lastFrame() ?? "");

@@ -611,7 +611,7 @@ describe("AdeCodeApp polling", () => {
     const calls = actionMock.mock.calls;
     expect(calls.filter(([domain, action]) => domain === "file" && action === "quickOpen")).toHaveLength(2);
     expect(calls.filter(([domain, action]) => domain === "git" && action === "listRecentCommits")).toHaveLength(1);
-    expect(calls.filter(([domain, action]) => domain === "pr" && action === "listAll")).toHaveLength(1);
+    expect(calls.filter(([domain, action]) => domain === "pr" && action === "listAll")).toHaveLength(2);
 
     await unmountApp(instance);
   });

@@ -1,5 +1,11 @@
 import { describe, expect, it } from "vitest";
-import { deriveChatInfoSnapshot, formatMcpCapabilityNote } from "../chatInfo";
+import {
+  chatInfoPrFromSummaries,
+  deriveChatInfoSnapshot,
+  formatChatPrHeaderLabel,
+  formatMcpCapabilityNote,
+} from "../chatInfo";
+import type { PrSummary } from "../../../../desktop/src/shared/types/prs";
 import type {
   AgentChatEventEnvelope,
   AgentChatSessionSummary,
@@ -457,6 +463,23 @@ describe("deriveChatInfoSnapshot", () => {
   });
 });
 
+describe("chat-linked PR header helpers", () => {
+  it("formats a compact header chip and chat-info rollup from linked summaries", () => {
+    const linked = [
+      { githubPrNumber: 42, state: "open", checksStatus: "passing" },
+      { githubPrNumber: 43, state: "open", checksStatus: "pending" },
+    ] as PrSummary[];
+    expect(formatChatPrHeaderLabel(linked)).toBe("#42 +1");
+    expect(formatChatPrHeaderLabel(linked.slice(0, 1))).toBe("#42");
+    expect(formatChatPrHeaderLabel([])).toBeNull();
+    expect(chatInfoPrFromSummaries(linked)).toMatchObject({
+      number: 42,
+      state: "open",
+      linkedNumbers: [43],
+    });
+  });
+});
+
 describe("formatMcpCapabilityNote", () => {
   it("reports delivery, not enforcement, when strict mode was never requested", () => {
     expect(formatMcpCapabilityNote({