@meistrari/remy-cli 1.14.1 → 1.16.0

package/README.md

@@ -36,7 +36,7 @@ The dashboard is the starting point for all interactive work. It refreshes the v
 
 ### Start work
 
-Press `n` in the dashboard. The new-session flow asks what you want done, selects a GitHub installation when needed, suggests repositories based on your request, and lets you review those suggestions. If the request links an open pull request in a selected repository, Remy checks the current pull request state before accepting branch confirmation and adds a third branch step: continue from that pull request's current branch or create a new session branch. Before creating the session, choose the agent model and reasoning effort. The wizard starts with `gpt-6-astra` and `medium` reasoning by default. Remy then opens the session and streams its activity.
+Press `n` in the dashboard. The new-session flow asks what you want done, selects a GitHub installation when needed, suggests repositories based on your request, and lets you review those suggestions. Remy analyzes the request for existing work: a Remy session ID or number, a PR URL or number (`PR 267`, `#267`, or `owner/repo#267`), or an exact or approximate branch name. It verifies matches against the selected repositories and offers up to five branches per repository. In the branch step, use arrows to move, Space to select, and Enter to select the current option and review your choices. Each repository can continue one branch or start a new session branch. A lookup failure stays on a retry screen; press `r` to retry, `n` to explicitly choose new branches, or Esc to edit the request. Before creating the session, choose the agent model and reasoning effort. The wizard starts with `gpt-6-astra` and `medium` reasoning by default. Remy then opens the session and streams its activity.
 
 Use `Tab` while writing the request to complete a local file or directory path. Remy attaches selected paths when you confirm the request. Each file may be at most 20 MiB. A directory may contain at most 20 MiB across its regular files before compression; Remy uploads it as a temporary `<directory>.tar.gz` archive with the selected directory preserved as its root, so the remote agent can extract and use its files. Remy rejects oversized attachments with guidance to choose a smaller file or directory, and rejects directory attachments that contain symbolic links or other non-regular entries. On macOS, `Ctrl+V` adds a PNG from the system clipboard to the request; Remy attaches it on confirmation. Remy uploads attachments before creating the session and shows their filenames beneath your message.
 
@@ -54,6 +54,8 @@ Published files and Tela Pages appear in the timeline. File artifacts include th
 
 When Remy creates a plan, the session shows its checklist in the timeline and keeps `Plan <done>/<total>` with the current item pinned above the composer. Updates change the same checklist instead of producing repeated rows, and an unfinished plan remains visible after reconnecting or between turns. The collapsed timeline shows up to five plan items; press `Ctrl+O` for the complete checklist and activity detail.
 
+Enter `/compact` to admit a durable main-thread context compaction control without sending a human message. Remy reports request admission immediately and shows the eventual completed, no-op, failed, or unknown provider result in retained activity. Compaction waits for a safe point and does not interrupt active work or jump ahead of an earlier Next message.
+
 Drag to select visible text in any Remy view; Remy copies it to the local clipboard and emits OSC 52 for terminal or remote-session clipboard support, then clears the selection highlight. Published file artifacts show their filename and muted, full web preview URL; open the URL in a browser to select that artifact in its session. Tela Page rows retain their canonical Page URL. Remy does not fetch or print artifact bytes. When the conversation has focus, press `Tab` to return to the composer.
 
 | Control | Result |
@@ -61,6 +63,7 @@ Drag to select visible text in any Remy view; Remy copies it to the local clipbo
 | `Esc` | Interrupt the active turn; the session stays open. |
 | `/complete` | Complete an open session after its active turn stops. |
 | `/cancel` | Cancel the current session, including an active turn. |
+| `/compact` | Admit a main-thread context compaction request without sending a message; the provider result appears in retained activity. |
 | `/sessions` | Return to the dashboard. |
 | `/new` | Start another new-session flow. |
 | `/logout` | Sign out of Remy after confirmation. |
@@ -91,6 +94,8 @@ remy new --repository owner/repository "Add a health check endpoint"
 
 Repeat `--repository` to select more repositories from the same GitHub installation. If you do not select a repository, supply `--installation <github-installation-id>`. Repeat `--attach <path>` to upload files or directories; the 20 MiB per-attachment limit is measured directly for a file and across all regular files before compressing a directory. Remy sends each accepted directory as a gzip-compressed tar archive. Direct creation uses `medium` reasoning unless `--reasoning-effort` overrides it; omit `--model` to use the server's `gpt-6-astra` default. `remy new` creates the session from the prompt and flags, then opens it when the terminal is interactive.
 
+The branch-suggestion flow belongs to the interactive new-session wizard (`remy`, then `n`). Direct `remy new` creation does not analyze continuation references.
+
 ### Open a known session
 
 ```bash

package/dist/remy.js

@@ -31690,6 +31690,12 @@ var branchSuggestionsResponseSchema = exports_external2.strictObject({
         url: exports_external2.url()
       })
     }),
+    exports_external2.strictObject({
+      repository_id: exports_external2.string().min(1),
+      suggestion_kind: exports_external2.literal("continue_existing_branch"),
+      branch_name: exports_external2.string().min(1),
+      pull_request: exports_external2.null()
+    }),
     exports_external2.strictObject({
       repository_id: exports_external2.string().min(1),
       suggestion_kind: exports_external2.literal("create_session_branch"),
@@ -31791,6 +31797,7 @@ async function suggestRemoteBranches({
     method: "POST",
     headers: { "content-type": "application/json" },
     body: JSON.stringify({
+      suggestion_mode: "prompt",
       github_installation_id: parsedInput.installationId,
       prompt: parsedInput.prompt,
       repository_ids: parsedInput.repositoryIds
@@ -31810,6 +31817,11 @@ async function suggestRemoteBranches({
     repositoryId: repository.repository_id,
     branchName: repository.branch_name,
     pullRequest: repository.pull_request
+  } : repository.suggestion_kind === "continue_existing_branch" ? {
+    suggestionKind: "continueExistingBranch",
+    repositoryId: repository.repository_id,
+    branchName: repository.branch_name,
+    pullRequest: null
   } : {
     suggestionKind: "createSessionBranch",
     repositoryId: repository.repository_id,
@@ -32202,6 +32214,10 @@ var interruptAgentCommandSchema = runningCommandBaseSchema.extend({
   turnId: zod_default2.string().min(1).optional(),
   reason: zod_default2.string().min(1).optional()
 }).strict();
+var compactContextAgentCommandSchema = runningCommandBaseSchema.extend({
+  type: zod_default2.literal("agent.compact-context"),
+  commandId: commandIdSchema
+}).strict();
 var stopAgentCommandSchema = runningCommandBaseSchema.extend({
   type: zod_default2.literal("agent.stop"),
   reason: zod_default2.string().min(1).optional()
@@ -32215,6 +32231,7 @@ var respondUserInputAgentCommandSchema = runningCommandBaseSchema.extend({
 var agentCommandSchema = zod_default2.union([
   sendPromptCommandSchema,
   interruptAgentCommandSchema,
+  compactContextAgentCommandSchema,
   stopAgentCommandSchema,
   respondUserInputAgentCommandSchema
 ]);
@@ -32408,6 +32425,12 @@ var agentTurnEndStatusSchema = zod_default2.enum(["completed", "failed", "cancel
 var agentSubagentStatusSchema = zod_default2.enum(["completed", "failed", "cancelled"]);
 var agentContextCompactionTriggerSchema = zod_default2.enum(["manual", "auto", "unknown"]);
 var agentContextCompactionStatusSchema = zod_default2.enum(["completed", "failed"]);
+var agentContextCompactionRequestResultSchema = zod_default2.discriminatedUnion("status", [
+  zod_default2.object({ status: zod_default2.literal("completed") }).strict(),
+  zod_default2.object({ status: zod_default2.literal("no_op"), reason: zod_default2.string() }).strict(),
+  zod_default2.object({ status: zod_default2.literal("failed"), error: agentErrorSchema }).strict(),
+  zod_default2.object({ status: zod_default2.literal("unknown") }).strict()
+]);
 var agentErrorSourceSchema = zod_default2.enum(["provider", "runtime", "transport", "unknown"]);
 var agentSkillScopeSchema = zod_default2.enum(["user", "repository", "system", "admin"]);
 var agentSkillSchema = zod_default2.object({
@@ -32660,6 +32683,13 @@ var contextCompactionCompletedAgentEventSchema = agentTurnEventBaseSchema.extend
     error: agentErrorSchema.optional()
   }).strict()
 }).strict();
+var contextCompactionRequestCompletedAgentEventSchema = agentEventBaseSchema.extend({
+  type: zod_default2.literal("context.compaction.request.completed"),
+  payload: zod_default2.object({
+    commandId: zod_default2.string().min(1),
+    result: agentContextCompactionRequestResultSchema
+  }).strict()
+}).strict();
 var userInputRequestedAgentEventSchema = agentTurnEventBaseSchema.extend({
   type: zod_default2.literal("user-input.requested"),
   payload: zod_default2.object({
@@ -32712,6 +32742,7 @@ var agentEventSchema = zod_default2.discriminatedUnion("type", [
   contextUpdatedAgentEventSchema,
   contextCompactionStartedAgentEventSchema,
   contextCompactionCompletedAgentEventSchema,
+  contextCompactionRequestCompletedAgentEventSchema,
   userInputRequestedAgentEventSchema,
   userInputResolvedAgentEventSchema,
   errorAgentEventSchema
@@ -32900,6 +32931,13 @@ var interruptSessionResponseSchema = exports_external2.strictObject({
     type: exports_external2.literal("agent.interrupt")
   })
 });
+var compactSessionContextResponseSchema = exports_external2.strictObject({
+  command: exports_external2.strictObject({
+    id: exports_external2.string(),
+    sequence: exports_external2.number().int().positive(),
+    type: exports_external2.literal("agent.compact-context")
+  })
+});
 var withdrawSessionMessageResponseSchema = exports_external2.strictObject({
   command: exports_external2.strictObject({
     id: exports_external2.string(),
@@ -33070,6 +33108,24 @@ async function interruptSession({
     throw new CodingAgentProtocolError("Session interrupt response did not match the public API contract.", { cause: parsed.error });
   return parsed.data.command;
 }
+async function compactSessionContext({
+  client,
+  sessionId,
+  idempotencyKey
+}) {
+  const response = await client.request(`/v1/sessions/${encodeURIComponent(sessionId)}/compact`, {
+    method: "POST",
+    headers: {
+      "content-type": "application/json",
+      "Idempotency-Key": idempotencyKey
+    },
+    body: "{}"
+  });
+  const parsed = compactSessionContextResponseSchema.safeParse(await parseJson2(response, "Session context compaction response was not valid JSON."));
+  if (!parsed.success)
+    throw new CodingAgentProtocolError("Session context compaction response did not match the public API contract.", { cause: parsed.error });
+  return parsed.data.command;
+}
 async function completeSession({ client, sessionId }) {
   const response = await client.request(`/v1/sessions/${encodeURIComponent(sessionId)}/complete`, { method: "PUT" });
   const parsed = sessionDetailResponseSchema.safeParse(await parseJson2(response, "Session completion response was not valid JSON."));
@@ -34010,6 +34066,9 @@ var wrappedContextCompactionStartedAgentEventSchema = contextCompactionStartedAg
 var wrappedContextCompactionCompletedAgentEventSchema = contextCompactionCompletedAgentEventSchema.extend({
   type: zod_default2.literal("agent.context.compaction.completed")
 }).strict();
+var wrappedContextCompactionRequestCompletedAgentEventSchema = contextCompactionRequestCompletedAgentEventSchema.extend({
+  type: zod_default2.literal("agent.context.compaction.request.completed")
+}).strict();
 var wrappedUserInputRequestedAgentEventSchema = userInputRequestedAgentEventSchema.extend({
   type: zod_default2.literal("agent.user-input.requested")
 }).strict();
@@ -34044,11 +34103,31 @@ var wrappedAgentEventSchema = zod_default2.discriminatedUnion("type", [
   wrappedContextUpdatedAgentEventSchema,
   wrappedContextCompactionStartedAgentEventSchema,
   wrappedContextCompactionCompletedAgentEventSchema,
+  wrappedContextCompactionRequestCompletedAgentEventSchema,
   wrappedUserInputRequestedAgentEventSchema,
   wrappedUserInputResolvedAgentEventSchema,
   wrappedErrorAgentEventSchema
 ]);
 
+// ../../packages/agents-protocol/src/agent-identity.ts
+function normalizeAgentSubagentIdentity(identity) {
+  return {
+    actorId: identity.actorId,
+    subagentId: identity.subagentId,
+    parentActorId: identity.parentActorId,
+    origin: identity.origin,
+    parentToolCallId: identity.parentToolCallId ?? (identity.origin.type === "tool_call" ? identity.origin.toolCallId : undefined)
+  };
+}
+function agentSubagentIdentitiesEqual(left, right) {
+  const normalizedLeft = normalizeAgentSubagentIdentity(left);
+  const normalizedRight = normalizeAgentSubagentIdentity(right);
+  return normalizedLeft.actorId === normalizedRight.actorId && normalizedLeft.subagentId === normalizedRight.subagentId && normalizedLeft.parentActorId === normalizedRight.parentActorId && normalizedLeft.parentToolCallId === normalizedRight.parentToolCallId && (normalizedLeft.origin.type === "tool_call" ? normalizedRight.origin.type === "tool_call" && normalizedLeft.origin.toolCallId === normalizedRight.origin.toolCallId : normalizedRight.origin.type === "provider_task" && normalizedLeft.origin.taskId === normalizedRight.origin.taskId);
+}
+function agentRuntimeIdentityKey(event) {
+  return `${event.sessionId.length}:${event.sessionId}:${event.providerSessionId.length}:${event.providerSessionId}`;
+}
+
 // src/sessions/projection.ts
 var sessionMessageCreatedEventSchema = exports_external2.object({
   type: exports_external2.literal("session.message.created"),
@@ -34377,11 +34456,7 @@ function projectAgentTurnEnded({ state, event, occurredAt, retainedEventId }) {
     retainedTurnEnds: { ...state.retainedTurnEnds, [event.turnId]: { actorType: event.actor.type, outcome: event.payload.status } },
     messageTurns: Object.fromEntries(Object.entries(state.messageTurns).map(([messageId, turn]) => [messageId, turn.turnId === event.turnId ? { ...turn, outcome: event.payload.status } : turn]))
   } : state;
-  const card = event.actor.type === "main" ? event.payload.status === "failed" ? { kind: "failure", weight: "signal", title: "Remy turn failed", summary: "Turn failed." } : { kind: "lifecycle", weight: "noise", title: "Remy turn ended", summary: `Turn ${event.payload.status}.` } : createChildActivityCard({
-    identity: event.actor,
-    activityTitle: event.payload.status === "failed" ? "Turn failed" : "Turn ended",
-    card: event.payload.status === "failed" ? { kind: "failure", weight: "signal", summary: providerText(event.payload.error?.message, "Turn failed.") } : { kind: "lifecycle", weight: "noise", summary: `Turn ${event.payload.status}.` }
-  });
+  const card = toAgentActivityCard(event);
   return appendActivity({ state: stateWithTurnOutcome, retainedEventId, occurredAt, card });
 }
 function projectDurableAgentEvent({ state, event, occurredAt, retainedEventId }) {
@@ -34526,7 +34601,7 @@ function toMainAgentActivityCard(event) {
     case "agent.turn.started":
       return { kind: "lifecycle", weight: "noise", title: "Remy turn started", summary: "Turn started." };
     case "agent.turn.ended":
-      return event.payload.status === "failed" ? { kind: "failure", weight: "signal", title: "Remy turn failed", summary: providerText(event.payload.error?.message, "Turn failed.") } : { kind: "lifecycle", weight: "noise", title: "Remy turn ended", summary: `Turn ${event.payload.status}.` };
+      return event.payload.status === "failed" ? { kind: "failure", weight: "signal", title: "Remy turn failed", summary: "Turn failed." } : { kind: "lifecycle", weight: "noise", title: "Remy turn ended", summary: `Turn ${event.payload.status}.` };
     case "agent.work.observed":
       return { kind: "progress", weight: "noise", title: "Work progress", summary: "Remy updated its work plan.", detail: jsonDetail(event.payload.observations) };
     case "agent.message.started":
@@ -34562,6 +34637,16 @@ function toMainAgentActivityCard(event) {
       return { kind: "reasoning", weight: "noise", title: "Context compaction started", summary: "Remy is compacting context." };
     case "agent.context.compaction.completed":
       return event.payload.status === "failed" ? { kind: "failure", weight: "signal", title: "Context compaction failed", summary: providerText(event.payload.error?.message, "Context compaction failed.") } : { kind: "reasoning", weight: "noise", title: "Context compaction completed", summary: "Remy compacted context." };
+    case "agent.context.compaction.request.completed": {
+      const result = event.payload.result;
+      if (result.status === "completed")
+        return { kind: "progress", weight: "signal", title: "Context compaction completed", summary: "The provider completed manual context compaction." };
+      if (result.status === "no_op")
+        return { kind: "progress", weight: "signal", title: "Context not compacted", summary: providerText(result.reason, "The provider did not compact context.") };
+      if (result.status === "failed")
+        return { kind: "failure", weight: "signal", title: "Context compaction failed", summary: providerText(result.error.message, "Context compaction failed.") };
+      return { kind: "progress", weight: "signal", title: "Context compaction result unknown", summary: "The provider result could not be correlated." };
+    }
     case "agent.user-input.requested":
       return { kind: "approval-question", weight: "signal", title: "Remy needs input", summary: providerText(event.payload.prompt, "Remy needs input."), detail: jsonDetail(event.payload.questions) };
     case "agent.user-input.resolved":
@@ -34647,6 +34732,7 @@ function toChildAgentActivityCard({ event, identity }) {
     case "agent.session.skills.updated":
     case "agent.session.state.changed":
     case "agent.session.ended":
+    case "agent.context.compaction.request.completed":
     case "agent.user-input.resolved":
     case "agent.error":
       throw new SessionProjectionProtocolError(`Cannot attribute non-child session event type ${event.type} to a subagent.`);
@@ -34689,7 +34775,7 @@ ${card.detail}`;
 function childActivityIdentity(event) {
   if (event.type === "agent.subagent.started" || event.type === "agent.subagent.progress" || event.type === "agent.subagent.ended") {
     if (event.actor.type === "subagent") {
-      if (!subagentLifecycleIdentityMatches({ actor: event.actor, payload: event.payload }))
+      if (!agentSubagentIdentitiesEqual(event.actor, event.payload))
         throw new SessionProjectionProtocolError(`Retained session event type ${event.type} carried contradictory subagent actor and payload identity.`);
       return {
         ...event.actor,
@@ -34711,14 +34797,6 @@ function childActivityIdentity(event) {
   }
   return;
 }
-function subagentLifecycleIdentityMatches({ actor, payload }) {
-  return actor.actorId === payload.actorId && actor.subagentId === payload.subagentId && actor.parentActorId === payload.parentActorId && actor.parentToolCallId === payload.parentToolCallId && subagentOriginsMatch(actor.origin, payload.origin);
-}
-function subagentOriginsMatch(left, right) {
-  if (left.type === "tool_call")
-    return right.type === "tool_call" && left.toolCallId === right.toolCallId;
-  return right.type === "provider_task" && left.taskId === right.taskId;
-}
 function recordAgentLineageEvent({
   state,
   event,
@@ -34734,7 +34812,7 @@ function recordAgentLineageEvent({
       return state;
     throw error93;
   }
-  const runtimeBase = lineageRuntimeBase(parsed);
+  const runtimeBase = agentRuntimeIdentityKey(parsed);
   let childLineage = state.childLineage;
   if (parsed.type === "agent.session.started" || parsed.type === "agent.session.ended") {
     const boundaryKey = `${runtimeBase}:${lengthPrefixed(parsed.eventId)}`;
@@ -34793,7 +34871,7 @@ function recordAgentLineageEvent({
   return stampResolvedAttribution({ state: nextState, retainedEventId, fact, owner: resolution.owner });
 }
 function resolveBodyFactAgainstOwners(owners, fact) {
-  const candidates = owners.filter((owner) => owner.runtimeScope === fact.runtimeScope && childIdentityMatches(owner.identity, fact.identity));
+  const candidates = owners.filter((owner) => owner.runtimeScope === fact.runtimeScope && agentSubagentIdentitiesEqual(owner.identity, fact.identity));
   const turnCandidates = candidates.filter((owner) => owner.childTurnIds.has(fact.turnId));
   if (turnCandidates.length === 1)
     return { status: "known", owner: turnCandidates[0] };
@@ -34825,9 +34903,6 @@ function stampResolvedAttribution({ state, retainedEventId, fact, owner }) {
   }
   return state;
 }
-function lineageRuntimeBase(event) {
-  return `${lengthPrefixed(event.sessionId)}:${lengthPrefixed(event.providerSessionId)}`;
-}
 function lineageRuntimeScope({ runtimeBase, epoch }) {
   return `${runtimeBase}:${epoch}`;
 }
@@ -34840,9 +34915,6 @@ function isChildLineageFact(fact) {
 function isSubagentLifecycleType(type) {
   return type === "agent.subagent.started" || type === "agent.subagent.progress" || type === "agent.subagent.ended";
 }
-function childIdentityMatches(left, right) {
-  return left.actorId === right.actorId && left.subagentId === right.subagentId && left.parentActorId === right.parentActorId && left.parentToolCallId === right.parentToolCallId && subagentOriginsMatch(left.origin, right.origin);
-}
 function childIdentityCanAnchor(identity) {
   return identity.actorId !== identity.parentActorId && (identity.origin.type !== "tool_call" || identity.parentToolCallId === undefined || identity.parentToolCallId === identity.origin.toolCallId);
 }
@@ -34876,9 +34948,9 @@ function reconcileChildLineage(state) {
     if (parent && ownerHasActorAncestor(parent, fact.identity.actorId))
       return;
     const samePlacement = owners.filter((owner2) => owner2.runtimeScope === fact.runtimeScope && owner2.owningMainTurnId === owningMainTurnId && owner2.parent === parent && owner2.identity.actorId === fact.identity.actorId && owner2.identity.subagentId === fact.identity.subagentId);
-    if (samePlacement.some((owner2) => !childIdentityMatches(owner2.identity, fact.identity)))
+    if (samePlacement.some((owner2) => !agentSubagentIdentitiesEqual(owner2.identity, fact.identity)))
       return;
-    const existing = samePlacement.find((owner2) => childIdentityMatches(owner2.identity, fact.identity));
+    const existing = samePlacement.find((owner2) => agentSubagentIdentitiesEqual(owner2.identity, fact.identity));
     if (existing)
       return existing;
     const owner = {
@@ -34912,7 +34984,7 @@ function reconcileChildLineage(state) {
       const toolTurn = mainTurnForToolOrigin(fact);
       if (toolTurn === undefined)
         continue;
-      const owner = owners.find((candidate) => candidate.runtimeScope === fact.runtimeScope && candidate.parent === null && candidate.owningMainTurnId === toolTurn && childIdentityMatches(candidate.identity, fact.identity)) ?? createOwner({ fact, owningMainTurnId: toolTurn, parent: null });
+      const owner = owners.find((candidate) => candidate.runtimeScope === fact.runtimeScope && candidate.parent === null && candidate.owningMainTurnId === toolTurn && agentSubagentIdentitiesEqual(candidate.identity, fact.identity)) ?? createOwner({ fact, owningMainTurnId: toolTurn, parent: null });
       if (owner) {
         ownerByFactOrder.set(fact.order, owner);
         owner.childTurnIds.add(fact.turnId);
@@ -34925,7 +34997,7 @@ function reconcileChildLineage(state) {
     for (const fact of childFacts) {
       if (ownerByFactOrder.has(fact.order))
         continue;
-      const candidates = owners.filter((owner2) => owner2.runtimeScope === fact.runtimeScope && childIdentityMatches(owner2.identity, fact.identity));
+      const candidates = owners.filter((owner2) => owner2.runtimeScope === fact.runtimeScope && agentSubagentIdentitiesEqual(owner2.identity, fact.identity));
       const turnCandidates = candidates.filter((owner2) => owner2.childTurnIds.has(fact.turnId));
       const owner = turnCandidates.length === 1 ? turnCandidates[0] : candidates.length === 1 ? candidates[0] : undefined;
       if (!owner || fact.eventType === "agent.subagent.started")
@@ -35001,12 +35073,16 @@ function ownerPath(owner) {
   return path;
 }
 function childAttributionEqual(left, right) {
-  if (left.status !== right.status || left.activityTitle !== right.activityTitle || !childIdentityMatches(left.identity, right.identity)) {
+  if (left === right)
+    return true;
+  if (!left || !right)
+    return false;
+  if (left.status !== right.status || left.activityTitle !== right.activityTitle || left.identity.name !== right.identity.name || !agentSubagentIdentitiesEqual(left.identity, right.identity)) {
     return false;
   }
   if (left.status === "unresolved" || right.status === "unresolved")
     return true;
-  return left.ownerKey === right.ownerKey && left.owningMainTurnId === right.owningMainTurnId && left.path.length === right.path.length && left.path.every((identity, index) => childIdentityMatches(identity, right.path[index]));
+  return left.ownerKey === right.ownerKey && left.owningMainTurnId === right.owningMainTurnId && left.path.length === right.path.length && left.path.every((identity, index) => identity.name === right.path[index].name && agentSubagentIdentitiesEqual(identity, right.path[index]));
 }
 function terminalSafeSingleLine(value) {
   return stripAnsi(value).replace(/\s+/gu, " ").trim();
@@ -36935,6 +37011,19 @@ async function createNewSessionWizard({
         overrides.delete(repositoryId);
       else
         overrides.set(repositoryId, isSelected);
+    }, branchOverridesForSelection = function() {
+      return [...selectedBranches].map(([repositoryId, branchName]) => ({ repositoryId, branchName }));
+    }, branchOptions = function() {
+      return [...selectedRepositoryIds()].flatMap((repositoryId) => {
+        const existing = branchSuggestions.filter((suggestion) => suggestion.repositoryId === repositoryId && suggestion.suggestionKind !== "createSessionBranch");
+        return [...existing, { suggestionKind: "createSessionBranch", repositoryId, branchName: null, pullRequest: null }];
+      });
+    }, selectBranchOption = function() {
+      const option = branchOptions()[branchOptionIndex];
+      if (option.branchName === null)
+        selectedBranches.delete(option.repositoryId);
+      else
+        selectedBranches.set(option.repositoryId, option.branchName);
     }, renderRepositoryLoadingSkeleton = function() {
       return new StyledText5([
         dim4(fg6(PALETTE.dimText)(`\u283F \u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588
@@ -36947,7 +37036,7 @@ async function createNewSessionWizard({
       const orient = (body) => joinStyled([renderStepIndicator({
         step,
         hasInstallationChoice: installationIds.length > 1,
-        hasBranchChoice: step === "loadingBranches" || branchSuggestions.some((suggestion) => suggestion.suggestionKind !== "createSessionBranch")
+        hasBranchChoice: step === "loadingBranches" || step === "branchError" || branchSuggestions.some((suggestion) => suggestion.suggestionKind !== "createSessionBranch")
       }), body], `
 `);
       if (composerVisible && !composerMounted) {
@@ -37023,31 +37112,39 @@ async function createNewSessionWizard({
       } else if (step === "loadingBranches") {
         content.content = orient(joinStyled([
           new StyledText5([stepHeader("Choose branches")]),
-          new StyledText5([fg6(PALETTE.progress)(`${suggestionSpinnerFrames[suggestionSpinnerFrame]} Remy is checking for related open pull requests\u2026`)]),
+          new StyledText5([fg6(PALETTE.progress)(`${suggestionSpinnerFrames[suggestionSpinnerFrame]} Remy is analyzing session, PR, and branch references\u2026`)]),
           new StyledText5([dim4(fg6(PALETTE.dimText)("This can take a few seconds."))]),
           stringToStyledText4("esc back")
         ], `
 
+`));
+      } else if (step === "branchError") {
+        content.content = orient(joinStyled([
+          new StyledText5([stepHeader("Branch lookup failed")]),
+          stringToStyledText4(status),
+          stringToStyledText4("r retry \xB7 n explicitly choose new branches \xB7 esc back")
+        ], `
+
 `));
       } else if (step === "branches") {
-        const existing = branchSuggestions.filter((suggestion) => suggestion.suggestionKind !== "createSessionBranch");
-        const parts = [new StyledText5([stepHeader("Choose branches")])];
-        if (existing.length > 0) {
-          parts.push(stringToStyledText4("Remy found related open pull-request work:"));
-          for (const suggestion of existing) {
-            const repository = installationRepositories().find((candidate) => candidate.id === suggestion.repositoryId);
-            parts.push(stringToStyledText4(`${repository?.fullName ?? suggestion.repositoryId} \u2014 ${suggestion.branchName}${suggestion.pullRequest ? ` (PR #${suggestion.pullRequest.number}: ${suggestion.pullRequest.title})` : ""}`));
-          }
-          parts.push(new StyledText5(renderSelectableRow({ label: "Continue from the suggested branch", isCursor: branchChoice === "existing" })));
-          parts.push(new StyledText5(renderSelectableRow({ label: "Create a new session branch", isCursor: branchChoice === "new" })));
-          parts.push(stringToStyledText4("\u2191\u2193 choose \xB7 \u23CE continue \xB7 esc back"));
-        } else {
-          parts.push(stringToStyledText4("Remy recommends creating a new session branch."));
-          parts.push(new StyledText5([dim4(fg6(PALETTE.dimText)(status || "No related open pull request was identified from your request."))]));
-          parts.push(stringToStyledText4("\u23CE continue \xB7 esc back"));
+        const options = branchOptions();
+        const visibleCount = Math.max(2, renderer.height - 12);
+        const start = Math.max(0, Math.min(branchOptionIndex - Math.floor(visibleCount / 2), options.length - visibleCount));
+        const parts = [
+          new StyledText5([stepHeader("Choose branches")]),
+          stringToStyledText4("Continue from the suggested branch, or choose new work for each repository:")
+        ];
+        for (const [index, option] of options.slice(start, start + visibleCount).entries()) {
+          const repository = installationRepositories().find((repository2) => repository2.id === option.repositoryId);
+          const selected = (selectedBranches.get(option.repositoryId) ?? null) === option.branchName;
+          const label = option.branchName === null ? "Create a new session branch" : `${option.branchName}${option.pullRequest ? ` (PR #${option.pullRequest.number}: ${option.pullRequest.title})` : ""}`;
+          parts.push(new StyledText5(renderSelectableRow({
+            label: `${selected ? "\u25CF" : "\u25CB"} ${repository?.fullName ?? option.repositoryId} \u2014 ${label}`,
+            isCursor: start + index === branchOptionIndex
+          })));
         }
+        parts.push(stringToStyledText4(`\u2191\u2193 move \xB7 space select \xB7 \u23CE select & review \xB7 esc back (${branchOptionIndex + 1}/${options.length})`));
         content.content = orient(joinStyled(parts, `
-
 `));
       } else if (repositoryListVisible) {
         const selectionOverrides = searchSelections ?? manualSelections;
@@ -37092,13 +37189,13 @@ async function createNewSessionWizard({
         editor.placeholder = "e.g. worker, migration, dashboard";
       } else {
         const selected = installationRepositories().filter((repository) => selectedRepositoryIds().has(repository.id));
-        const branchOverrides = branchChoice === "existing" ? branchSuggestions.filter((suggestion) => suggestion.suggestionKind !== "createSessionBranch") : [];
+        const branchOverrides = branchOverridesForSelection();
         const meta5 = new StyledText5([
           fg6(PALETTE.bodyText)(`Installation: ${selectedInstallationId() ?? "(missing)"}
 `),
           fg6(PALETTE.bodyText)(`Repositories: ${selected.map((repository) => repository.fullName).join(", ") || "(none)"}
 `),
-          fg6(PALETTE.bodyText)(`Branches: ${branchOverrides.length > 0 ? branchOverrides.map((override) => override.branchName).join(", ") : "new session branches"}
+          fg6(PALETTE.bodyText)(`Branches: ${branchOverrides.length > 0 ? selected.map((repository) => `${repository.fullName}: ${selectedBranches.get(repository.id) ?? "new session branch"}`).join(", ") : "new session branches"}
 `),
           fg6(PALETTE.bodyText)(`Model: ${newSessionModelLabel(model)} \xB7 ${newSessionReasoningEffortLabel(reasoningEffort)} reasoning`),
           dim4(fg6(PALETTE.dimText)("   \u25B8 m model \xB7 \u2190\u2192 reasoning"))
@@ -37111,7 +37208,7 @@ async function createNewSessionWizard({
         ];
         if (attachmentText.chunks.length > 0)
           parts.push(attachmentText);
-        parts.push(new StyledText5([dim4(fg6(PALETTE.dimText)(branchOverrides.length > 0 ? "Remy will continue on the selected existing branch and update its pull request; you land in the session view." : "Remy will clone the selected repositories, work on new session branches, and open a pull request for each repository; you land in the session view."))]));
+        parts.push(new StyledText5([dim4(fg6(PALETTE.dimText)(branchOverrides.length > 0 ? "Remy will continue on the selected branches and create new branches for other repositories; you land in the session view." : "Remy will clone the selected repositories, work on new session branches, and open a pull request for each repository; you land in the session view."))]));
         parts.push(stringToStyledText4(branchSuggestions.some((suggestion) => suggestion.suggestionKind !== "createSessionBranch") ? "\u23CE create \xB7 e edit prompt \xB7 r repositories \xB7 b branches \xB7 esc back" : "\u23CE create \xB7 e edit prompt \xB7 r repositories \xB7 esc back"));
         if (status)
           parts.push(stringToStyledText4(status));
@@ -37244,7 +37341,7 @@ async function createNewSessionWizard({
         returnToPromptFromRepositoryLoading();
         return;
       }
-      if (step === "loadingBranches" || step === "branches") {
+      if (step === "loadingBranches" || step === "branches" || step === "branchError") {
         branchRequestGeneration += 1;
         step = "repositories";
         render();
@@ -37354,6 +37451,17 @@ async function createNewSessionWizard({
           return;
         }
       }
+      if (step === "branchError" && (key.name === "r" || key.name === "n")) {
+        key.preventDefault();
+        if (key.name === "r") {
+          startBranchReview();
+        } else {
+          status = "";
+          step = "confirmation";
+          render();
+        }
+        return;
+      }
       if (step === "repositorySearch")
         return;
       if (step === "loadingSuggestions" && key.name === "s") {
@@ -37373,15 +37481,23 @@ async function createNewSessionWizard({
           return;
         }
       }
+      if (step === "branches" && key.name === "space") {
+        key.preventDefault();
+        selectBranchOption();
+        render();
+        return;
+      }
       if (step === "branches" && branchSuggestions.some((suggestion) => suggestion.suggestionKind !== "createSessionBranch") && (key.name === "up" || key.name === "down" || key.name === "left" || key.name === "right")) {
         key.preventDefault();
-        branchChoice = branchChoice === "existing" ? "new" : "existing";
+        const options = branchOptions();
+        const direction = key.name === "up" || key.name === "left" ? -1 : 1;
+        branchOptionIndex = (branchOptionIndex + direction + options.length) % options.length;
         render();
         return;
       }
       if (!composerMounted && (key.name === "return" || key.name === "enter")) {
         key.preventDefault();
-        if (step === "loadingBranches")
+        if (step === "loadingBranches" || step === "branchError")
           return;
         submitEditor();
         return;
@@ -37500,7 +37616,8 @@ async function createNewSessionWizard({
       branchName: override.branchName,
       pullRequest: null
     })) ?? [];
-    let branchChoice = initialDraft?.repositoryBranchOverrides?.length ? "existing" : "new";
+    const selectedBranches = new Map(initialDraft?.repositoryBranchOverrides?.map((override) => [override.repositoryId, override.branchName]));
+    let branchOptionIndex = 0;
     let status = initialError ?? "";
     let attachmentFeedback;
     let pendingPastedImageWrites = 0;
@@ -37575,9 +37692,16 @@ async function createNewSessionWizard({
       if (!installationId)
         return;
       const repositoryIds = [...selectedRepositoryIds()];
+      if (repositoryIds.length === 0) {
+        branchSuggestions = [];
+        selectedBranches.clear();
+        step = "confirmation";
+        render();
+        return;
+      }
       const requestGeneration = ++branchRequestGeneration;
       branchSuggestions = [];
-      branchChoice = "new";
+      selectedBranches.clear();
       step = "loadingBranches";
       status = "";
       render();
@@ -37587,15 +37711,19 @@ async function createNewSessionWizard({
           return;
         branchSuggestions = suggestions;
         const hasExistingBranch = branchSuggestions.some((suggestion) => suggestion.suggestionKind !== "createSessionBranch");
-        branchChoice = hasExistingBranch ? "existing" : "new";
+        for (const suggestion of branchSuggestions) {
+          if (suggestion.suggestionKind !== "createSessionBranch" && !selectedBranches.has(suggestion.repositoryId))
+            selectedBranches.set(suggestion.repositoryId, suggestion.branchName);
+        }
+        branchOptionIndex = 0;
         step = hasExistingBranch ? "branches" : "confirmation";
       } catch (error93) {
         if (destroyed || requestGeneration !== branchRequestGeneration || step !== "loadingBranches")
           return;
         branchSuggestions = [];
-        branchChoice = "new";
+        selectedBranches.clear();
         status = error93 instanceof Error ? error93.message : String(error93);
-        step = "confirmation";
+        step = "branchError";
       }
       render();
     }
@@ -37668,7 +37796,7 @@ async function createNewSessionWizard({
         fail(new Error("Selected repositories must belong to the chosen GitHub installation."));
         return;
       }
-      const repositoryBranchOverrides = branchChoice === "existing" ? branchSuggestions.flatMap((suggestion) => suggestion.suggestionKind === "createSessionBranch" ? [] : [{ repositoryId: suggestion.repositoryId, branchName: suggestion.branchName }]) : [];
+      const repositoryBranchOverrides = branchOverridesForSelection();
       const confirmation = Symbol("confirmation");
       const confirmedAttachments = [...attachments];
       const confirmedPrompt = prompt;
@@ -37755,6 +37883,7 @@ async function createNewSessionWizard({
         return;
       }
       if (step === "branches") {
+        selectBranchOption();
         step = "confirmation";
         render();
         return;
@@ -37870,7 +37999,7 @@ function wizardStepKey(step) {
     return "describe";
   if (step === "installation")
     return "installation";
-  if (step === "loadingBranches" || step === "branches")
+  if (step === "loadingBranches" || step === "branches" || step === "branchError")
     return "branches";
   if (step === "confirmation")
     return "confirm";
@@ -37925,6 +38054,7 @@ var composerSlashCommands = [
   { value: "/sessions", description: "Back to the session list" },
   { value: "/complete", description: "Finish this session" },
   { value: "/cancel", description: "Cancel this session" },
+  { value: "/compact", description: "Compact main-thread context" },
   { value: "/new", description: "Start a new session" },
   { value: "/logout", description: "Sign out of Remy" },
   { value: "/help", description: "Show what you can do here" },
@@ -37936,6 +38066,7 @@ async function createSessionTui({
   controller,
   submitMessage,
   requestInterrupt,
+  requestCompact,
   requestComplete,
   requestCancel,
   repositoryLabel,
@@ -38177,6 +38308,7 @@ async function createSessionTui({
     let admittedSubmissions = [];
     let stopState = { kind: "idle" };
     let lifecycleRequestState = { kind: "idle" };
+    let contextCompactionRequestState = { kind: "idle" };
     let helpVisible = false;
     let logoutConfirmationOpen = false;
     let latestState = controller.getState();
@@ -38527,6 +38659,12 @@ async function createSessionTui({
         handleLifecycleRequest("cancel");
         return true;
       }
+      if (command === "/compact") {
+        composer.setText("");
+        composerDraft = { ...composerDraft, text: "" };
+        await handleCompactionRequest();
+        return true;
+      }
       if (command === "/logout") {
         composer.setText("");
         composerDraft = { ...composerDraft, text: "" };
@@ -38614,6 +38752,39 @@ async function createSessionTui({
       }
       render();
     }
+    async function handleCompactionRequest() {
+      if (contextCompactionRequestState.kind === "requesting")
+        return;
+      if (latestState.aggregateStatus !== "open") {
+        composerFeedback = "This session is already terminal.";
+        render();
+        return;
+      }
+      const idempotencyKey = contextCompactionRequestState.kind === "delivery-unknown" ? contextCompactionRequestState.idempotencyKey : crypto.randomUUID();
+      contextCompactionRequestState = { kind: "requesting", idempotencyKey };
+      composerFeedback = "Requesting context compaction\u2026";
+      render();
+      try {
+        await requestCompact({ idempotencyKey });
+        if (!destroyed) {
+          contextCompactionRequestState = { kind: "admitted" };
+          composerFeedback = "Context compaction request admitted. Result will appear in the timeline.";
+        }
+      } catch (error93) {
+        if (!destroyed) {
+          const message = error93 instanceof Error ? error93.message : String(error93);
+          if (isKnownClientRejection(error93)) {
+            contextCompactionRequestState = { kind: "idle" };
+            composerFeedback = `Could not request context compaction: ${message}`;
+          } else {
+            contextCompactionRequestState = { kind: "delivery-unknown", idempotencyKey };
+            composerFeedback = `Context compaction admission is unknown: ${message}. Run /compact again to retry the same request.`;
+          }
+        }
+      }
+      if (!destroyed)
+        render();
+    }
     async function handleLifecycleRequest(operation) {
       if (lifecycleRequestState.kind === "pending")
         return;
@@ -38740,6 +38911,7 @@ var helpEntries = [
   { group: "command", token: "/sessions", description: "back to the session list" },
   { group: "command", token: "/complete", description: "finish this session" },
   { group: "command", token: "/cancel", description: "cancel this session" },
+  { group: "command", token: "/compact", description: "compact main-thread context" },
   { group: "command", token: "/logout", description: "sign out of Remy" },
   { group: "command", token: "/exit", description: "leave Remy" },
   { group: "key", token: "esc", description: "stop Remy\u2019s current turn" },
@@ -38957,19 +39129,7 @@ function activityGlyph({ kind, inFlight }) {
   return { glyph: "\u2713", color: PALETTE.dimText };
 }
 function activityCardsHaveEqualDisclosure(left, right) {
-  return left.kind === right.kind && left.title === right.title && left.summary === right.summary && left.detail === right.detail && left.detailFormat === right.detailFormat && canonicalValuesEqual(left.attribution, right.attribution);
-}
-function canonicalValuesEqual(left, right) {
-  if (Object.is(left, right))
-    return true;
-  if (Array.isArray(left) || Array.isArray(right)) {
-    return Array.isArray(left) && Array.isArray(right) && left.length === right.length && left.every((value, index) => canonicalValuesEqual(value, right[index]));
-  }
-  if (typeof left !== "object" || left === null || typeof right !== "object" || right === null)
-    return false;
-  const leftEntries = Object.entries(left);
-  const rightEntries = Object.entries(right);
-  return leftEntries.length === rightEntries.length && leftEntries.every(([key, value], index) => rightEntries[index]?.[0] === key && canonicalValuesEqual(value, rightEntries[index]?.[1]));
+  return left.kind === right.kind && left.title === right.title && left.summary === right.summary && left.detail === right.detail && left.detailFormat === right.detailFormat && childAttributionEqual(left.attribution, right.attribution);
 }
 function renderActivityGroup({ items, activityExpanded }) {
   if (items.length === 0)
@@ -39170,6 +39330,12 @@ function renderComposerStatus({ admittedSubmissions }) {
 
 `);
 }
+function isKnownClientRejection(error93) {
+  if (typeof error93 !== "object" || error93 === null || !("status" in error93))
+    return false;
+  const status = error93.status;
+  return typeof status === "number" && status >= 400 && status < 500;
+}
 async function createDefaultRenderer3() {
   return await createRemyRenderer();
 }
@@ -39430,7 +39596,7 @@ var compactMarkRows = 9;
 var compactMinWidth = 48;
 var compactMinHeight = 20;
 var markBrightnessGain = 4.2;
-var remyCliVersion = "1.14.1";
+var remyCliVersion = "1.16.0";
 async function showRemySplash({
   createRenderer = createRemyRenderer,
   durationMs = splashDurationMs,
@@ -40833,6 +40999,9 @@ async function runAttachedSession({
             requestInterrupt: async ({ idempotencyKey }) => {
               await operations.interruptSession({ client: operations.client, sessionId, idempotencyKey });
             },
+            requestCompact: async ({ idempotencyKey }) => {
+              await operations.compactSessionContext({ client: operations.client, sessionId, idempotencyKey });
+            },
             requestComplete: async () => {
               const detail = await operations.completeSession({ client: operations.client, sessionId });
               controller.updateDetail(detail);
@@ -40959,6 +41128,7 @@ async function createSessionOperations(dependencies, { onAuthenticated } = {}) {
       appendSessionMessage: dependencies.appendSessionMessage ?? appendSessionMessage,
       cancelSession: dependencies.cancelSession ?? cancelSession,
       completeSession: dependencies.completeSession ?? completeSession,
+      compactSessionContext: dependencies.compactSessionContext ?? compactSessionContext,
       interruptSession: dependencies.interruptSession ?? interruptSession,
       getSession: dependencies.getSession ?? getSession,
       listSessionEvents: dependencies.listSessionEvents ?? listSessionEvents,
@@ -40979,6 +41149,7 @@ async function createSessionOperations(dependencies, { onAuthenticated } = {}) {
     appendSessionMessage: dependencies.appendSessionMessage ?? appendSessionMessage,
     cancelSession: dependencies.cancelSession ?? cancelSession,
     completeSession: dependencies.completeSession ?? completeSession,
+    compactSessionContext: dependencies.compactSessionContext ?? compactSessionContext,
     interruptSession: dependencies.interruptSession ?? interruptSession,
     getSession: dependencies.getSession ?? getSession,
     listSessionEvents: dependencies.listSessionEvents ?? listSessionEvents,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@meistrari/remy-cli",
-    "version": "1.14.1",
+    "version": "1.16.0",
     "description": "Remy, the Coding Agent terminal client.",
     "type": "module",
     "bin": {