@moda-ai/cli 1.55.38 → 1.55.39

package/dist/{agent-9r58v0bc.js → agent-bhe95ae8.js}

@@ -1,8 +1,8 @@
 import {
   buildDoctorReport
-} from "./cli-xtyszvq1.js";
-import"./cli-sk1p71wr.js";
-import"./cli-dmnayt2r.js";
+} from "./cli-msgp78ag.js";
+import"./cli-ptm7pwqg.js";
+import"./cli-jmbt1hf9.js";
 import"./cli-mm48br00.js";
 import {
   readHarnessSyncState
@@ -15,15 +15,15 @@ import {
   readHarnessReport,
   validateHarnessReport
 } from "./cli-cesds766.js";
-import"./cli-b7nyw498.js";
-import"./cli-xheg54qc.js";
-import"./cli-3n040fp2.js";
+import"./cli-jkza0bj6.js";
+import"./cli-k9se46y4.js";
+import"./cli-qzag917n.js";
 import {
   resolveApiKey,
   resolveIngestUrl,
   resolveModaBaseUrl,
   resolveTenantId
-} from "./cli-rcjhfts4.js";
+} from "./cli-wr6f0kyw.js";
 import {
   CliInputError
 } from "./cli-k4tqwah4.js";
@@ -94,7 +94,7 @@ async function buildAgentContext(context) {
   const graph = readHarnessGraphIfPresent(context.cwd);
   const reportState = readHarnessReportState(context.cwd);
   const syncState = readHarnessSyncState(context.cwd);
-  const harness = graph ? await import("./harness-qatnwxrz.js") : undefined;
+  const harness = graph ? await import("./harness-n4569wbm.js") : undefined;
   const topFindings = doctor.checks.filter((check) => check.status === "fail" || check.status === "warning").slice(0, 12).map(checkToFinding);
   const evidenceRefs = [
     ...doctor.checks.map(checkToEvidenceRef),

package/dist/{cli-n311b8g0.js → cli-1vqq24qh.js}

@@ -1,6 +1,6 @@
 import {
   shellArg
-} from "./cli-rcjhfts4.js";
+} from "./cli-wr6f0kyw.js";
 import {
   CliInputError
 } from "./cli-k4tqwah4.js";

package/dist/{cli-xk630wjq.js → cli-2h2nvq6w.js}

@@ -1,6 +1,6 @@
 import {
   callControlAPI
-} from "./cli-3n040fp2.js";
+} from "./cli-qzag917n.js";
 
 // src/replay-runs.ts
 var DEFAULT_POLL_INTERVAL_MS = 15000;

package/dist/{cli-tdcx8yz9.js → cli-39617gab.js}

@@ -1,10 +1,10 @@
 import {
   fetchApiKeyProbe
-} from "./cli-9g5kzsg6.js";
+} from "./cli-4hkesrkq.js";
 import {
   authFetch,
   getCachedLoginContext
-} from "./cli-sk1p71wr.js";
+} from "./cli-ptm7pwqg.js";
 import {
   embeddedTenantIdFromApiKey,
   getModaDir,
@@ -15,7 +15,7 @@ import {
   resolveTenantIdFromActiveProfile,
   saveCliConfig,
   writeSecretJsonFile
-} from "./cli-rcjhfts4.js";
+} from "./cli-wr6f0kyw.js";
 import {
   CliAccessError,
   CliInputError,

package/dist/{cli-9g5kzsg6.js → cli-4hkesrkq.js}

@@ -5,7 +5,7 @@ import {
   resolveApiKey,
   resolveApiKeyFromActiveProfile,
   resolveModaBaseUrl
-} from "./cli-rcjhfts4.js";
+} from "./cli-wr6f0kyw.js";
 
 // src/api-key-auth.ts
 var PROBE_TIMEOUT_MS = 1e4;

package/dist/{cli-93926afn.js → cli-6gtgm2gx.js}

@@ -13,22 +13,22 @@ import {
 } from "./cli-hcwdz9sd.js";
 import {
   createCommandContext
-} from "./cli-b7nyw498.js";
+} from "./cli-jkza0bj6.js";
 import {
   assertFlags,
   assertPositionals,
   writeDryRun
-} from "./cli-xheg54qc.js";
+} from "./cli-k9se46y4.js";
 import {
   callControlAPI
-} from "./cli-3n040fp2.js";
+} from "./cli-qzag917n.js";
 import {
   recordApiRequest,
   resolveApiKey,
   resolveIngestUrl,
   resolveTenantId,
   shellArg
-} from "./cli-rcjhfts4.js";
+} from "./cli-wr6f0kyw.js";
 import {
   CliInputError
 } from "./cli-k4tqwah4.js";

package/dist/{cli-nh23q6ay.js → cli-as4c1xwm.js}

@@ -4,19 +4,19 @@ import {
   parsePromptFileForAb,
   readPromptLock,
   runPromptSync
-} from "./cli-dmnayt2r.js";
+} from "./cli-jmbt1hf9.js";
 import {
   DEFAULT_POLL_INTERVAL_MS,
   DEFAULT_WAIT_TIMEOUT_MS,
   fetchLatestRun
-} from "./cli-xk630wjq.js";
+} from "./cli-2h2nvq6w.js";
 import {
   UUID_RE
-} from "./cli-xheg54qc.js";
+} from "./cli-k9se46y4.js";
 import {
   callControlAPI,
   callDataAPI
-} from "./cli-3n040fp2.js";
+} from "./cli-qzag917n.js";
 import {
   EXIT_ERROR,
   EXIT_OK,
@@ -24,7 +24,7 @@ import {
   setPlatformTenantOverride,
   shellArg,
   validateConfig
-} from "./cli-rcjhfts4.js";
+} from "./cli-wr6f0kyw.js";
 import {
   CliInputError
 } from "./cli-k4tqwah4.js";

package/dist/{cli-skvvwp2q.js → cli-c7vj8tq1.js}

@@ -44,16 +44,16 @@ import {
 import {
   createCommandContext,
   stringOption
-} from "./cli-b7nyw498.js";
+} from "./cli-jkza0bj6.js";
 import {
   assertFlags,
   assertPositionals,
   requireTenant
-} from "./cli-xheg54qc.js";
+} from "./cli-k9se46y4.js";
 import {
   ApiError,
   callControlAPI
-} from "./cli-3n040fp2.js";
+} from "./cli-qzag917n.js";
 import {
   embeddedTenantIdFromApiKey,
   getActiveProfile,
@@ -63,7 +63,7 @@ import {
   resolveModaBaseUrl,
   resolveTenantId,
   shellArg
-} from "./cli-rcjhfts4.js";
+} from "./cli-wr6f0kyw.js";
 import {
   CliInputError,
   CliInputRequiredError
@@ -14048,7 +14048,7 @@ async function runHarnessCommand(context) {
         throw new CliInputError("Focused remote prompt analysis is not supported yet.", "Use local --analyst=claude|codex|cursor|local-scan, or drop --concern for a full remote report.");
       }
       if (context.flags["github-actions"] === "true") {
-        const { runGithubActionsAnalyze } = await import("./harness-github-actions-drbkcb8d.js");
+        const { runGithubActionsAnalyze } = await import("./harness-github-actions-mcy21e4d.js");
         const result = await runGithubActionsAnalyze(rootDir, {
           writeReport: (report2) => {
             const normalized = normalizeHarnessReport(report2);

package/dist/{cli-b7nyw498.js → cli-jkza0bj6.js}

@@ -1,7 +1,7 @@
 import {
   createCliOutput,
   outputModeFromFlags
-} from "./cli-rcjhfts4.js";
+} from "./cli-wr6f0kyw.js";
 
 // src/boolean-words.ts
 var BOOLEAN_TRUE_WORDS = new Set(["true", "yes", "1", "on"]);

package/dist/{cli-dmnayt2r.js → cli-jmbt1hf9.js}

@@ -4,14 +4,14 @@ import {
 } from "./cli-mm48br00.js";
 import {
   createCommandContext
-} from "./cli-b7nyw498.js";
+} from "./cli-jkza0bj6.js";
 import {
   assertFlags,
   assertPositionals
-} from "./cli-xheg54qc.js";
+} from "./cli-k9se46y4.js";
 import {
   callControlAPI
-} from "./cli-3n040fp2.js";
+} from "./cli-qzag917n.js";
 import {
   CliInputError
 } from "./cli-k4tqwah4.js";
@@ -5725,9 +5725,9 @@ async function runPromptsCommand(input, legacyFlags, legacyProfileOptions) {
       await promotePrompt(positionals, flags, profileOptions, context);
       break;
     case "ab":
-      return (await import("./prompts-ab-yd2dawe3.js")).runPromptAb(flags, profileOptions, context);
+      return (await import("./prompts-ab-9e0dsmce.js")).runPromptAb(flags, profileOptions, context);
     case "propose":
-      await (await import("./prompts-propose-11dj9ked.js")).runPromptPropose(positionals, flags, profileOptions, context);
+      await (await import("./prompts-propose-91qrjpd0.js")).runPromptPropose(positionals, flags, profileOptions, context);
       break;
     case "list":
     case "show":
@@ -5830,7 +5830,7 @@ async function runPromptSyncExclusive(flags, profileOptions, options) {
   const analyzedDefinitions = new Map;
   if (flags["no-analyze"] !== "true") {
     options.onProgress?.("Analyzing prompt sources before sync.");
-    const { analyzeHarnessPrompts } = await import("./harness-qatnwxrz.js");
+    const { analyzeHarnessPrompts } = await import("./harness-n4569wbm.js");
     const result = await analyzeHarnessPrompts({
       rootDir: process.cwd(),
       existing: established.flatMap((prompt) => prompt.sourceDefinition ? [prompt.sourceDefinition.source] : []),
@@ -5858,7 +5858,7 @@ async function runPromptSyncExclusive(flags, profileOptions, options) {
   const mergedSources = mergePromptSources(manifest.sources, extraSources);
   const manifestUpdate = stableJson(mergedSources) === stableJson(mergePromptSources(manifest.sources, [])) ? undefined : $stringify({ version: 2, prompt_paths: manifest.promptPaths, sources: mergedSources });
   const prompts = await discoverPrompts(extraSources);
-  const { checkPromptAttribution } = await import("./prompt-attribution-zq38actx.js");
+  const { checkPromptAttribution } = await import("./prompt-attribution-dm50am6e.js");
   const attribution = checkPromptAttribution(process.cwd(), prompts.map((prompt) => prompt.key));
   const brokenAttribution = attribution.references.filter((reference) => reference.status === "missing");
   if (brokenAttribution.length) {
@@ -6164,7 +6164,7 @@ async function migratePromptManifest(options = {}) {
   let addedSources = [];
   let pendingSources = [];
   if (options.discover) {
-    const { analyzeHarnessPrompts } = await import("./harness-qatnwxrz.js");
+    const { analyzeHarnessPrompts } = await import("./harness-n4569wbm.js");
     const result = await analyzeHarnessPrompts({
       rootDir: root,
       existing: manifest.sources,

package/dist/{cli-xheg54qc.js → cli-k9se46y4.js}

@@ -2,7 +2,7 @@ import {
   ApiError,
   callControlAPI,
   callDataAPI
-} from "./cli-3n040fp2.js";
+} from "./cli-qzag917n.js";
 import {
   continuationCommand,
   embeddedTenantIdFromApiKey,
@@ -11,7 +11,7 @@ import {
   resolveApiTenantId,
   setPlatformTenantOverride,
   shellArg
-} from "./cli-rcjhfts4.js";
+} from "./cli-wr6f0kyw.js";
 import {
   CliAccessError,
   CliInputError
@@ -144,9 +144,21 @@ var FrustrationsSchema = z.object({
 var ToolFailuresSchema = z.object({
   days_back: daysBackFlag(7)
 });
+var PROBLEM_LIST_VIEWS = ["auto", "book", "dream"];
+var BOOK_PROBLEM_SORTS = ["rank", "users", "signals", "problems"];
+var DREAM_PROBLEM_SORTS = ["severity", "users", "silent"];
+var PROBLEMS_MAX_LIMIT = 200;
+var PROBLEMS_DEFAULT_LIMIT = 10;
+var COHORT_REF = /^(all|builtin:[a-z_]{1,64}|[a-z_]{1,64}|[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12})$/;
 var ProblemsSchema = z.object({
-  days_back: daysBackFlag(30),
-  limit: z.number().int().min(1).max(25).default(25).optional().describe("Maximum Problems to return")
+  view: z.enum(PROBLEM_LIST_VIEWS).default("auto").optional().describe("auto: what the dashboard shows (the dream grouping when published, else the Book); book or dream to force one"),
+  days_back: daysBackFlag().describe("Whole days to look back (Book default 30; the dream view defaults to its run window)"),
+  limit: z.number().int().min(1).max(PROBLEMS_MAX_LIMIT).default(PROBLEMS_DEFAULT_LIMIT).optional().describe("Problems per page (Book: per partition, problems and untrusted)"),
+  offset: z.number().int().min(0).max(1e4).optional().describe("Row to start at: next_offset from the previous page"),
+  list_version: z.string().regex(/^[0-9a-f]{1,64}$/, "must be the list_version of a previous page").optional().describe("list_version of the first page, passed with every later --offset"),
+  sort: z.string().regex(/^(rank|severity|users|signals|problems|silent|signal:[a-z_]{1,64})$/, "must be rank, severity, users, silent (dream), signals, problems or signal:<family> (Book)").optional().describe("Order: rank (default), users; dream: severity, silent; Book: signals, problems, signal:<family>"),
+  dir: z.enum(["desc", "asc"]).optional().describe("Sort direction (default desc)"),
+  cohort: z.string().regex(COHORT_REF, "must be builtin:<key> or a saved cohort id").optional().describe("Only the Problems this cohort hit (builtin:<key> or a saved cohort id), with its counts")
 });
 var REMAINDER_FAMILIES = [
   "tool_failure",
@@ -200,7 +212,10 @@ var ProblemSchema = z.object({
   limit: z.number().int().min(1).max(50).optional().describe("Page size for a sub-resource page"),
   cursor: z.string().optional().describe("next_cursor from the previous page, verbatim"),
   family: z.enum(PROBLEM_FAMILIES).optional().describe("With --traces: only this signal family"),
-  door: z.enum(PROBLEM_DOORS).optional().describe("With --traces: only this attribution door")
+  door: z.enum(PROBLEM_DOORS).optional().describe("With --traces: only this attribution door"),
+  view: z.enum(["book", "dream"]).optional().describe("dream: the dream view of the problem (definition, severity, incidents with verdicts); default the dossier"),
+  offset: z.number().int().min(0).max(1e4).optional().describe("With --view=dream: first incident to return"),
+  days_back: daysBackFlag().describe("With --view=dream: whole days to count (default the dream run window)")
 });
 var PROBLEM_FEEDBACK_ACTIONS = [
   "mark_fixed",
@@ -1415,4 +1430,4 @@ function unknownSignalsSubcommandError(sub, args = []) {
   ${SIGNAL_USAGE}`);
 }
 
-export { TRACE_GRAIN_FLAGS, ProblemsRemainderSchema, UUID_RE, ProblemImpactSchema, PROBLEM_FEEDBACK_ACTIONS, ProblemFeedbackSchema, ProblemLinearFileSchema, SignalLabelSchema, DETECTION_VERDICTS, DetectionReviewSchema, FALSE_POSITIVE_KINDS, FalsePositiveSchema, EMOTION_FAMILIES, LAZINESS_FAMILIES, StepScoresSchema, AuditSchema, FEEDBACK_USAGE, isFeedbackRefFlag, buildFeedbackRequest, writeDryRun, COMMAND_FLAG_SPECS, flagSpecFor, kebabFlag, schemaShape, describeField, specFlagKeys, specFlagNames, describeSpecFlags, closestMatches, usageLine, renderFlagHelp, subcommandHelpFlags, manifestFlagFields, requireTenant, assertFlags, assertPositionals, runUsersCommand, runUserCommand, runProblemReopenCommand, runSignalsManagementCommand, SIGNALS_MANAGEMENT_SUBCOMMANDS, unknownSignalsSubcommandError };
+export { TRACE_GRAIN_FLAGS, BOOK_PROBLEM_SORTS, DREAM_PROBLEM_SORTS, PROBLEMS_MAX_LIMIT, PROBLEMS_DEFAULT_LIMIT, ProblemsRemainderSchema, UUID_RE, ProblemImpactSchema, PROBLEM_FEEDBACK_ACTIONS, ProblemFeedbackSchema, ProblemLinearFileSchema, SignalLabelSchema, DETECTION_VERDICTS, DetectionReviewSchema, FALSE_POSITIVE_KINDS, FalsePositiveSchema, EMOTION_FAMILIES, LAZINESS_FAMILIES, StepScoresSchema, AuditSchema, FEEDBACK_USAGE, isFeedbackRefFlag, buildFeedbackRequest, writeDryRun, COMMAND_FLAG_SPECS, flagSpecFor, kebabFlag, schemaShape, describeField, specFlagKeys, specFlagNames, describeSpecFlags, closestMatches, usageLine, renderFlagHelp, subcommandHelpFlags, manifestFlagFields, requireTenant, assertFlags, assertPositionals, runUsersCommand, runUserCommand, runProblemReopenCommand, runSignalsManagementCommand, SIGNALS_MANAGEMENT_SUBCOMMANDS, unknownSignalsSubcommandError };

package/dist/{cli-xtyszvq1.js → cli-msgp78ag.js}

@@ -1,10 +1,10 @@
 import {
   isAuthSessionValid,
   loadAuthSession
-} from "./cli-sk1p71wr.js";
+} from "./cli-ptm7pwqg.js";
 import {
   inspectPromptManifest
-} from "./cli-dmnayt2r.js";
+} from "./cli-jmbt1hf9.js";
 import {
   readHarnessSyncState,
   renderDoctorHuman,
@@ -12,7 +12,7 @@ import {
 } from "./cli-xq45etg1.js";
 import {
   callDataAPI
-} from "./cli-3n040fp2.js";
+} from "./cli-qzag917n.js";
 import {
   ensureSecretFilePermissions,
   getActiveProfile,
@@ -26,7 +26,7 @@ import {
   resolveSecretReference,
   resolveTenantId,
   secretFilePathFromRef
-} from "./cli-rcjhfts4.js";
+} from "./cli-wr6f0kyw.js";
 import {
   __require
 } from "./cli-0v6na3yp.js";
@@ -376,7 +376,7 @@ async function harnessCurrentCheck(cwd, manifestPath, manifestExists, tenantId)
     };
   }
   try {
-    const { scanHarness } = await import("./harness-qatnwxrz.js");
+    const { scanHarness } = await import("./harness-n4569wbm.js");
     const current = scanHarness({
       rootDir: cwd,
       scannerVersion: "doctor",

package/dist/{cli-sk1p71wr.js → cli-ptm7pwqg.js}

@@ -6,7 +6,7 @@ import {
   saveProfileConfig,
   secretFilePathFromRef,
   writeSecretJsonFile
-} from "./cli-rcjhfts4.js";
+} from "./cli-wr6f0kyw.js";
 import {
   CliAuthError,
   CliInputError

package/dist/{cli-3n040fp2.js → cli-qzag917n.js}

@@ -3,7 +3,7 @@ import {
   recordApiRequest,
   resolveApiKey,
   resolveModaBaseUrl
-} from "./cli-rcjhfts4.js";
+} from "./cli-wr6f0kyw.js";
 
 // src/api-client.ts
 var REQUEST_TIMEOUT_MS = 30000;

package/dist/{cli-rcjhfts4.js → cli-wr6f0kyw.js}

@@ -1277,7 +1277,10 @@ function createAgentEnvelope(options) {
     findings: text.findings,
     evidence_refs: text.evidence_refs,
     recommended_actions: text.recommended_actions,
-    next_commands: [...withoutSupersededPaging(text.next_commands, bounded.supersededPaging), ...canonicalSuggestions(bounded.nextCommands ?? [])],
+    next_commands: [
+      ...withoutSupersededPaging(text.next_commands, bounded.supersededPaging).filter((command) => !(command.nextPage && bounded.nextCommands?.length)).map(({ nextPage: _nextPage, ...command }) => command),
+      ...canonicalSuggestions(bounded.nextCommands ?? [])
+    ],
     artifacts: [
       ...options.artifacts ?? [],
       ...bounded.fullOutputPath ? [{ kind: "full_output", path: bounded.fullOutputPath, description: "Complete command output (the same JSON --json prints); data in this envelope was bounded." }] : [],
@@ -1925,6 +1928,7 @@ var PAGED_LIST_BY_COMMAND = {
   emotions: ["detections", "traces"],
   frustrations: ["frustrations", "traces"],
   laziness: "conversations",
+  problems: ["problems", "untrusted"],
   "problems remainder": "groups",
   "problem remainder": "groups"
 };
@@ -1936,7 +1940,7 @@ function pagedListsFor(invocation) {
 }
 var MAX_PAGE_OFFSET = 1e4;
 function rewritePagination(list, isTopLevel, invocation) {
-  const { parent, array, originalLength } = list;
+  const { parent, array } = list;
   if (!parent)
     return;
   const nested = asRecord(parent.pagination);
@@ -1946,32 +1950,40 @@ function rewritePagination(list, isTopLevel, invocation) {
     return;
   const listKey = list.path.split(".").pop() ?? list.path;
   const arrayKeys = Object.keys(parent).filter((key) => Array.isArray(parent[key]));
-  if (arrayKeys.length > 1) {
-    const paged = invocation ? pagedListsFor(invocation) : [];
-    if (!paged.includes(listKey))
-      return;
-  }
-  if (typeof pagination.returned === "number" ? pagination.returned !== originalLength : typeof pagination.limit === "number" && originalLength > pagination.limit) {
+  const paged = invocation ? pagedListsFor(invocation) : [];
+  if (arrayKeys.length > 1 && !paged.includes(listKey))
+    return;
+  if (typeof pagination.returned === "number" ? pagination.returned !== list.originalLength : typeof pagination.limit === "number" && list.originalLength > pagination.limit) {
     return;
   }
-  const kept = array.length;
+  const kept = list.page?.kept ?? array.length;
+  const originalLength = list.page?.original ?? list.originalLength;
   const omitted = originalLength - kept;
+  const requested = typeof pagination.limit === "number" ? pagination.limit : undefined;
+  const step = requested !== undefined ? Math.min(kept, requested) : kept;
+  const ranked = requested !== undefined ? Math.min(requested, originalLength) : originalLength;
+  const nextLimit = ranked > step ? ranked - step : requested ?? omitted;
   const offset = typeof pagination.offset === "number" && Number.isFinite(pagination.offset) ? pagination.offset : undefined;
   const hadCursor = typeof pagination.next_cursor === "string" && pagination.next_cursor.length > 0 || typeof pagination.nextCursor === "string" && pagination.nextCursor.length > 0;
   if (typeof pagination.limit === "number") {
     pagination.requested_limit = pagination.limit;
     pagination.limit = kept;
   }
-  pagination.returned = kept;
+  pagination.returned = array.length;
+  for (const key of paged.slice(1)) {
+    if (typeof pagination[`${key}_returned`] === "number" && Array.isArray(parent[key])) {
+      pagination[`${key}_returned`] = parent[key].length;
+    }
+  }
   pagination.omitted_for_byte_limit = omitted;
   pagination.has_more = true;
   if ("hasMore" in pagination)
     pagination.hasMore = true;
   if ("nextCursor" in pagination && typeof pagination.nextCursor === "string" && pagination.nextCursor)
     pagination.nextCursor = null;
-  const pastOffsetCap = offset !== undefined && offset + kept > MAX_PAGE_OFFSET;
+  const pastOffsetCap = offset !== undefined && offset + step > MAX_PAGE_OFFSET;
   if (offset !== undefined && !pastOffsetCap)
-    pagination.next_offset = offset + kept;
+    pagination.next_offset = offset + step;
   if (hadCursor)
     pagination.next_cursor = null;
   const where = `data.${list.path}`;
@@ -1984,12 +1996,15 @@ function rewritePagination(list, isTopLevel, invocation) {
     return { note: `${where} holds ${kept} of ${originalLength} row(s)` };
   }
   if (offset !== undefined) {
-    const command = continuationCommand(invocation, { offset: offset + kept, limit: omitted });
+    const overrides = { offset: offset + step, limit: nextLimit };
+    if (typeof pagination.list_version === "string")
+      overrides["list-version"] = pagination.list_version;
+    const command = continuationCommand(invocation, overrides);
     return {
-      note: `${where} holds ${kept} of ${originalLength} row(s); pagination.next_offset=${offset + kept}. Fetch the ${omitted} omitted row(s) with: ${command}`,
+      note: `${where} holds ${kept} of ${originalLength} row(s); pagination.next_offset=${offset + step}. Fetch the ${omitted} omitted row(s) with: ${command}`,
       nextCommand: {
         command,
-        purpose: `Fetch the ${omitted} row(s) of this page that were left out to fit the agent byte limit.`,
+        purpose: `Continue from the first row of this page that was left out to fit the agent byte limit.`,
         mutability: "read",
         requires_approval: false
       },
@@ -2066,6 +2081,10 @@ function boundForAgent(data, maxBytes = agentMaxOutputBytes(), options = {}) {
       boundedBytes = sizeOf(bounded);
     }
   }
+  const root = asRecord(bounded);
+  if (root && options.invocation && alignPagedLists(root, pagedListsFor(options.invocation), droppedLists, droppedItems)) {
+    boundedBytes = sizeOf(bounded);
+  }
   const dropped = Object.entries(droppedItems);
   const whereIsTheRest = fullOutputPath ? `The complete output (every item, no text shortened) is in ${fullOutputPath}; read it in line ranges or query it with jq. ` : "The complete output could not be saved to a file. ";
   const howToGetMore = whereIsTheRest + "Alternatively narrow the query (a smaller --limit, with --offset or --cursor paging where the command supports it), " + "rerun with --json (no byte limit), or raise MODA_AGENT_MAX_OUTPUT_BYTES.";
@@ -2081,7 +2100,6 @@ function boundForAgent(data, maxBytes = agentMaxOutputBytes(), options = {}) {
       fullOutputPath
     };
   }
-  const root = asRecord(bounded);
   const notes = [];
   const nextCommands = [];
   const supersededPaging = new Set;
@@ -2129,6 +2147,37 @@ function withoutSupersededPaging(commands, superseded) {
   const flags = superseded.map((flag) => new RegExp(`(^|\\s)--${flag}=`));
   return commands.filter((next) => !flags.some((flag) => flag.test(next.command)));
 }
+function alignPagedLists(root, lists, droppedLists, droppedItems) {
+  if (lists.length < 2)
+    return false;
+  const cut = lists.flatMap((key) => {
+    const list = droppedLists.get(key);
+    return list && list.parent === root ? [list] : [];
+  });
+  if (cut.length === 0)
+    return false;
+  const kept = Math.min(...cut.map((list) => list.array.length));
+  let aligned = false;
+  let primary;
+  let original = 0;
+  for (const key of lists) {
+    const array = root[key];
+    if (!Array.isArray(array))
+      continue;
+    const length = droppedLists.get(key)?.originalLength ?? array.length;
+    original = Math.max(original, length);
+    if (array.length > kept) {
+      droppedItems[key] = (droppedItems[key] ?? 0) + array.length - kept;
+      array.splice(kept);
+      aligned = true;
+    }
+    droppedLists.delete(key);
+    primary ??= { path: key, parent: root, array, originalLength: length };
+  }
+  if (primary)
+    droppedLists.set(primary.path, { ...primary, page: { kept, original } });
+  return aligned;
+}
 function asRecord(value) {
   return value && typeof value === "object" && !Array.isArray(value) ? value : undefined;
 }