@ai0x0/codex-ts 0.6.4 → 0.7.0

package/dist/core/src/skills.js

@@ -19,6 +19,13 @@
 const DEFAULT_SKILL_METADATA_CHAR_BUDGET = 8_000;
 const SKILL_METADATA_CONTEXT_WINDOW_PERCENT = 2;
 const APPROX_BYTES_PER_TOKEN = 4;
+// mirrors MAX_DEFAULT_CONTEXT_SKILL_DESCRIPTION_CHARS / the "..." suffix
+// (render.rs:20-21): a single skill can't monopolise the catalog with a
+// thousands-of-chars description.
+const MAX_DEFAULT_CONTEXT_SKILL_DESCRIPTION_CHARS = 1_024;
+const TRUNCATED_SKILL_DESCRIPTION_SUFFIX = "...";
+// mirrors SKILL_DESCRIPTION_TRUNCATION_WARNING_THRESHOLD_CHARS (render.rs:22)
+const SKILL_DESCRIPTION_TRUNCATION_WARNING_THRESHOLD_CHARS = 100;
 const TEXT_ENCODER = new TextEncoder();
 function byteLength(text) {
     return TEXT_ENCODER.encode(text).length;
@@ -53,9 +60,29 @@ export function defaultSkillMetadataBudget(contextWindow) {
 function normalizedPath(skill) {
     return skill.path.replace(/\\/g, "/");
 }
+/**
+ * Cap a description before it ever reaches the budget allocator.
+ * mirrors truncate_default_context_skill_description (render.rs:537), applied in
+ * SkillLine::with_path — the ORIGINAL SkillMetadata is never mutated.
+ */
+export function truncateDefaultContextSkillDescription(description) {
+    const codePoints = Array.from(description);
+    if (codePoints.length <= MAX_DEFAULT_CONTEXT_SKILL_DESCRIPTION_CHARS) {
+        return description;
+    }
+    const prefixChars = MAX_DEFAULT_CONTEXT_SKILL_DESCRIPTION_CHARS -
+        Array.from(TRUNCATED_SKILL_DESCRIPTION_SUFFIX).length;
+    return (codePoints.slice(0, prefixChars).join("") +
+        TRUNCATED_SKILL_DESCRIPTION_SUFFIX);
+}
 // render.rs SkillLine::render_full
 function renderSkillLineFull(skill) {
-    return renderSkillLineWithDescriptionChars(skill, Array.from(skill.description).length);
+    return renderSkillLineWithDescriptionChars(skill, Array.from(catalogDescription(skill)).length);
+}
+// The description as it appears in the catalog (render.rs SkillLine.description:
+// a Cow that is the capped form when the raw description is over the cap).
+function catalogDescription(skill) {
+    return truncateDefaultContextSkillDescription(skill.description);
 }
 // render.rs SkillLine::render_with_description_chars
 function renderSkillLineWithDescriptionChars(skill, descriptionChars) {
@@ -63,17 +90,25 @@ function renderSkillLineWithDescriptionChars(skill, descriptionChars) {
     if (descriptionChars === 0) {
         return `- ${skill.name}: (file: ${path})`;
     }
-    const description = Array.from(skill.description)
+    const description = Array.from(catalogDescription(skill))
         .slice(0, descriptionChars)
         .join("");
     return `- ${skill.name}: ${description} (file: ${path})`;
 }
+/** mirrors SkillRenderReport::average_truncated_description_chars (render.rs:431) */
+function averageTruncatedDescriptionChars(report) {
+    if (report.totalCount === 0 || report.truncatedDescriptionChars === 0) {
+        return 0;
+    }
+    return Math.floor((report.truncatedDescriptionChars + report.totalCount - 1) /
+        report.totalCount);
+}
 function descriptionBudgetLine(skill, budget) {
     const minimumLine = renderSkillLineWithDescriptionChars(skill, /*descriptionChars*/ 0);
     const minimumChars = Array.from(minimumLine).length + 1; // +1 for "\n"
     const minimumBytes = byteLength(minimumLine) + 1;
     const minimumCost = budgetCostFromCounts(budget, minimumChars, minimumBytes);
-    const descriptionCodePoints = Array.from(skill.description);
+    const descriptionCodePoints = Array.from(catalogDescription(skill));
     const extraCosts = [0];
     let prefixChars = 0;
     let prefixBytes = 0;
@@ -116,15 +151,24 @@ function renderLinesWithDescriptionBudget(skills, budget, limit) {
             break;
         }
     }
-    return budgetLines.map((line, index) => renderSkillLineWithDescriptionChars(line.skill, charAllocations[index]));
+    // mirrors the RenderedSkillLine mapping at the tail of
+    // render_lines_with_description_budget (render.rs:639): truncated_chars is how
+    // much of the (already capped) description had to be dropped.
+    return budgetLines.map((line, index) => ({
+        line: renderSkillLineWithDescriptionChars(line.skill, charAllocations[index]),
+        truncatedChars: Math.max(0, line.descriptionCharCount - charAllocations[index]),
+    }));
 }
-// render.rs render_minimum_skill_lines_until_budget — when even the no-description
-// lines overflow, keep adding minimum lines until the budget is spent; the rest
-// are omitted.
+// render.rs render_minimum_skill_lines_until_budget (render.rs:664) — when even
+// the no-description lines overflow, keep adding minimum lines until the budget
+// is spent; the rest are omitted. Every dropped description counts as fully
+// truncated in the report.
 function renderMinimumUntilBudget(skills, budget) {
     const lines = [];
     let used = 0;
     let omitted = 0;
+    let truncatedDescriptionChars = 0;
+    let truncatedDescriptionCount = 0;
     for (const skill of skills) {
         const minimumLine = renderSkillLineWithDescriptionChars(skill, /*descriptionChars*/ 0);
         const cost = lineCost(budget, minimumLine);
@@ -135,43 +179,78 @@ function renderMinimumUntilBudget(skills, budget) {
         else {
             omitted += 1;
         }
+        const descriptionCharCount = Array.from(catalogDescription(skill)).length;
+        truncatedDescriptionChars += descriptionCharCount;
+        if (descriptionCharCount > 0) {
+            truncatedDescriptionCount += 1;
+        }
     }
-    return { lines, omitted };
+    return {
+        lines,
+        report: {
+            totalCount: skills.length,
+            includedCount: lines.length,
+            omittedCount: omitted,
+            truncatedDescriptionChars,
+            truncatedDescriptionCount,
+        },
+    };
 }
 // render.rs render_skill_lines_from_lines — three tiers: full → trimmed
 // descriptions → minimum-until-budget.
 function renderSkillLines(skills, budget) {
+    const noTruncation = (lines) => ({
+        totalCount: skills.length,
+        includedCount: lines.length,
+        omittedCount: 0,
+        truncatedDescriptionChars: 0,
+        truncatedDescriptionCount: 0,
+    });
     const fullCost = skills.reduce((used, skill) => used + lineCost(budget, renderSkillLineFull(skill)), 0);
     if (fullCost <= budget.limit) {
-        return { lines: skills.map(renderSkillLineFull), omitted: 0 };
+        const lines = skills.map(renderSkillLineFull);
+        return { lines, report: noTruncation(lines) };
     }
     const minimumCost = skills.reduce((used, skill) => used + lineCost(budget, renderSkillLineWithDescriptionChars(skill, /*descriptionChars*/ 0)), 0);
     if (minimumCost <= budget.limit) {
+        const rendered = renderLinesWithDescriptionBudget(skills, budget, budget.limit - minimumCost);
+        // mirrors sum_description_truncation (render.rs:459)
+        const truncated = rendered.filter((line) => line.truncatedChars > 0);
+        const lines = rendered.map((line) => line.line);
         return {
-            lines: renderLinesWithDescriptionBudget(skills, budget, budget.limit - minimumCost),
-            omitted: 0,
+            lines,
+            report: {
+                totalCount: skills.length,
+                includedCount: lines.length,
+                omittedCount: 0,
+                truncatedDescriptionChars: truncated.reduce((sum, line) => sum + line.truncatedChars, 0),
+                truncatedDescriptionCount: truncated.length,
+            },
         };
     }
     return renderMinimumUntilBudget(skills, budget);
 }
 // ─── Layer 1: catalog (mirrors render.rs render_available_skills_body) ────────
-// render.rs SKILLS_INTRO_WITH_ABSOLUTE_PATHS (verbatim)
-const SKILLS_INTRO = "A skill is a set of local instructions to follow that is stored in a `SKILL.md` file. Below is the list of skills that can be used. Each entry includes a name, description, and file path so you can open the source for full instructions when using a specific skill.";
+// render.rs SKILLS_INTRO_WITH_ABSOLUTE_PATHS (verbatim). Upstream reworded this
+// for non-filesystem skill sources (environment / orchestrator / custom
+// resources); codex-ts only ever renders `file` locators, but the text is kept
+// verbatim so the model sees exactly what codex-rs sends.
+const SKILLS_INTRO = "A skill is a set of instructions provided through a `SKILL.md` source. Below is the list of skills that can be used. Each entry includes a name, description, and source locator. `file` locators are on the host filesystem, `environment resource` locators are owned by an execution environment, `orchestrator resource` locators are opaque non-filesystem resources, and `custom resource` locators use their provider's access mechanism.";
 // render.rs SKILLS_HOW_TO_USE_WITH_ABSOLUTE_PATHS (verbatim)
-const SKILLS_HOW_TO_USE = `- Discovery: The list above is the skills available in this session (name + description + file path). Skill bodies live on disk at the listed paths.
+const SKILLS_HOW_TO_USE = `- Discovery: The list above is the skills available in this session (name + description + source locator). \`file\` entries live on the host filesystem, \`environment resource\` and \`orchestrator resource\` entries must be accessed through \`skills.list\` and \`skills.read\`, and \`custom resource\` entries use their provider's access mechanism.
 - Trigger rules: If the user names a skill (with \`$SkillName\` or plain text) OR the task clearly matches a skill's description shown above, you must use that skill for that turn. Multiple mentions mean use them all. Do not carry skills across turns unless re-mentioned.
-- Missing/blocked: If a named skill isn't in the list or the path can't be read, say so briefly and continue with the best fallback.
+- Missing/blocked: If a named skill isn't in the list or its source can't be read, say so briefly and continue with the best fallback.
 - How to use a skill (progressive disclosure):
-  1) After deciding to use a skill, open its \`SKILL.md\`. Read only enough to follow the workflow.
-  2) When \`SKILL.md\` references relative paths (e.g., \`scripts/foo.py\`), resolve them relative to the skill directory listed above first, and only consider other paths if needed.
-  3) If \`SKILL.md\` points to extra folders such as \`references/\`, load only the specific files needed for the request; don't bulk-load everything.
-  4) If \`scripts/\` exist, prefer running or patching them instead of retyping large code blocks.
-  5) If \`assets/\` or templates exist, reuse them instead of recreating from scratch.
+  1) After deciding to use a skill, the main agent must read its \`SKILL.md\` completely before taking task actions. For a \`file\` entry, open the listed path. For an \`environment resource\`, call \`skills.list\` with \`{"authority":{"kind":"executor"}}\`; for an \`orchestrator resource\`, use \`{"authority":{"kind":"orchestrator"}}\`. Select the matching package and pass its exact authority, package, and \`main_resource\` to \`skills.read\`. Follow \`next_cursor\`; if a read is paginated, continue until EOF.
+  2) When \`SKILL.md\` references another resource, use the same access mechanism. Resolve relative references beneath an executor skill's returned package and call \`skills.read\` with the same authority and package. For orchestrator skills, pass the exact referenced resource identifier with the same authority and package to \`skills.read\`; do not treat \`skill://\` identifiers as filesystem paths.
+  3) If \`SKILL.md\` points to extra folders such as \`references/\`, use its routing instructions to identify the resources required for the task. The main agent must read each required instruction or reference file itself before acting on it. Do not delegate reading, summarizing, or interpreting skill instructions to a subagent. Subagents may still perform task work when the selected skill allows it.
+  4) For filesystem-backed skills, prefer running or patching provided scripts instead of retyping large code blocks. For environment and orchestrator skills, use \`skills.read\` and the available tools; do not invent a local path.
+  5) Reuse provided assets or templates through the same source access mechanism instead of recreating them.
 - Coordination and sequencing:
   - If multiple skills apply, choose the minimal set that covers the request and state the order you'll use them.
   - Announce which skill(s) you're using and why (one short line). If you skip an obvious skill, say why.
 - Context hygiene:
-  - Keep context small: summarize long sections instead of pasting them; only load extra files when needed.
+  - Progressive disclosure applies to selecting relevant files, not partially reading a selected instruction file. Do not load unrelated references, scripts, or assets.
   - Avoid deep reference-chasing: prefer opening only files directly linked from \`SKILL.md\` unless you're blocked.
   - When variants exist (frameworks, providers, domains), pick only the relevant reference file(s) and note that choice.
 - Safety and fallback: If a skill can't be applied cleanly (missing files, unclear instructions), state the issue, pick the next-best approach, and continue.`;
@@ -184,11 +263,14 @@ const SKILL_DESCRIPTION_TRUNCATED_WARNING_WITH_PERCENT = "Skill descriptions wer
     "Codex can still see every skill, but some descriptions are shorter. " +
     "Disable unused skills or plugins to leave more room for the rest.";
 /**
- * Build the omission / truncation warning appended to the catalog.
- * mirrors render.rs build_available_skills_from_lines warning_message logic.
+ * Build the omission / truncation warning for a render report.
+ * mirrors build_available_skills_from_lines's warning_message (render.rs:208):
+ * omission wins over truncation, and truncation only warns once the AVERAGE
+ * dropped description exceeds SKILL_DESCRIPTION_TRUNCATION_WARNING_THRESHOLD_CHARS.
  */
-function buildCatalogWarning(omitted, truncated, budget) {
-    if (omitted > 0) {
+function buildCatalogWarning(report, budget) {
+    if (report.omittedCount > 0) {
+        const omitted = report.omittedCount;
         const skillWord = omitted === 1 ? "skill" : "skills";
         const verb = omitted === 1 ? "was" : "were";
         const prefix = budget.kind === "tokens"
@@ -196,7 +278,8 @@ function buildCatalogWarning(omitted, truncated, budget) {
             : SKILL_DESCRIPTIONS_REMOVED_WARNING_PREFIX;
         return `${prefix} ${omitted} additional ${skillWord} ${verb} not included in the model-visible skills list.`;
     }
-    if (truncated) {
+    if (averageTruncatedDescriptionChars(report) >
+        SKILL_DESCRIPTION_TRUNCATION_WARNING_THRESHOLD_CHARS) {
         return budget.kind === "tokens"
             ? SKILL_DESCRIPTION_TRUNCATED_WARNING_WITH_PERCENT
             : SKILL_DESCRIPTION_TRUNCATED_WARNING;
@@ -205,32 +288,54 @@ function buildCatalogWarning(omitted, truncated, budget) {
 }
 /**
  * Render the always-on skills catalog (Layer 1), trimmed to fit `budget`.
- * Mirrors render.rs render_available_skills_body (absolute-paths variant)
- * including the omission / truncation warning appended when the budget is tight.
- * Returns "" when there are no skills so callers can skip injection entirely.
+ * mirrors render_available_skills_body (render.rs:65) for the absolute-paths
+ * variant, plus AvailableSkillsInstructions::from_available_skills
+ * (core/src/context/available_skills_instructions.rs:25), which is where
+ * upstream moved the "### How to use skills" section.
  */
-export function renderSkillsCatalog(skills, budget = defaultSkillMetadataBudget()) {
+export function renderAvailableSkills(skills, budget = defaultSkillMetadataBudget()) {
     if (skills.length === 0) {
-        return "";
+        return {
+            body: "",
+            warningMessage: null,
+            report: {
+                totalCount: 0,
+                includedCount: 0,
+                omittedCount: 0,
+                truncatedDescriptionChars: 0,
+                truncatedDescriptionCount: 0,
+            },
+        };
     }
-    const { lines, omitted } = renderSkillLines(skills, budget);
-    // Detect whether any description was truncated by comparing rendered lengths
-    // to full descriptions (cheap proxy — good enough for the warning threshold).
-    const anyTruncated = skills.some((skill, i) => {
-        const rendered = lines[i] ?? "";
-        return skill.description.length > 0 && !rendered.includes(skill.description);
-    });
-    const warning = buildCatalogWarning(omitted, anyTruncated, budget);
+    const { lines, report } = renderSkillLines(skills, budget);
     const out = [
         "## Skills",
         SKILLS_INTRO,
         "### Available skills",
         ...lines,
-        ...(warning ? [warning] : []),
         "### How to use skills",
         SKILLS_HOW_TO_USE,
     ];
-    return `\n${out.join("\n")}\n`;
+    return {
+        body: `\n${out.join("\n")}\n`,
+        warningMessage: buildCatalogWarning(report, budget),
+        report,
+    };
+}
+/**
+ * Browser-specific convenience wrapper — codex-rs has no single-string form.
+ * Returns the catalog body with the budget warning appended, for hosts that
+ * inject one blob and have nowhere to route a separate warning. CodexThread
+ * itself uses renderAvailableSkills() and emits the warning as a `Warning`
+ * event, exactly like codex-rs.
+ * Returns "" when there are no skills so callers can skip injection entirely.
+ */
+export function renderSkillsCatalog(skills, budget = defaultSkillMetadataBudget()) {
+    const { body, warningMessage } = renderAvailableSkills(skills, budget);
+    if (body === "") {
+        return "";
+    }
+    return warningMessage ? `${body}${warningMessage}\n` : body;
 }
 // ─── Layer 2: mention detection (mirrors injection.rs) ────────────────────────
 // injection.rs is_common_env_var — skip `$HOME` etc. so env vars in prose don't

package/dist/core/src/skills.js.map

@@ -1 +1 @@
-{"version":3,"file":"skills.js","sourceRoot":"","sources":["../../../core/src/skills.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"skills.js","sourceRoot":"","sources":["../../../core/src/skills.ts"],"names":[],"mappings":"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"}

package/dist/core/src/state/auto_compact_window.d.ts

@@ -5,12 +5,27 @@
  * BodyAfterPrefix mode can measure context growth since the last compaction
  * rather than total context size.
  */
+/** mirrors AutoCompactWindowIds (auto_compact_window.rs:5).
+ *  rs mints Uuid::now_v7(); codex-ts uses crypto.randomUUID() when available
+ *  (browser + Node ≥ 19) and falls back to a counter-based id otherwise. */
+export interface AutoCompactWindowIds {
+    firstWindowId: string;
+    previousWindowId: string | null;
+    windowId: string;
+}
+/** mirrors AutoCompactWindowIds::new_initial (auto_compact_window.rs:12) */
+export declare function newInitialAutoCompactWindowIds(): AutoCompactWindowIds;
+/** mirrors AutoCompactWindowSnapshot (auto_compact_window.rs:22) — rs dropped the
+ *  `ordinal` field when window identity moved to windowNumber + ids. */
 export interface AutoCompactWindowSnapshot {
-    ordinal: number;
     prefillInputTokens: number | null;
 }
 export declare class AutoCompactWindow {
-    private ordinal;
+    /** mirrors window_number (auto_compact_window.rs:35) — starts at 0, not 1, and
+     *  advances once per compaction. */
+    private windowNumber;
+    private ids;
+    private newContextWindowRequested;
     /**
      * Absolute input-token baseline for the current window.
      * Set from the first server-observed usage after a new window opens;
@@ -18,9 +33,48 @@ export declare class AutoCompactWindow {
      */
     private prefillInputTokens;
     private prefillSource;
+    private tokenBudgetReminderDelivered;
+    private autoCompactFallbackDelivered;
     clearPrefill(): void;
-    /** Called after each compaction to start a fresh measurement window */
-    startNext(): void;
+    /** mirrors window_number() (auto_compact_window.rs:64) */
+    currentWindowNumber(): number;
+    /** mirrors ids() (auto_compact_window.rs:68) */
+    currentIds(): AutoCompactWindowIds;
+    /** mirrors restore() (auto_compact_window.rs:72) — used when a resumed thread
+     *  replays its persisted compaction checkpoints. */
+    restore(windowNumber: number, ids: AutoCompactWindowIds): void;
+    /**
+     * Open the next compaction window: bump the number, rotate the ids, and reset
+     * the per-window one-shot flags. mirrors advance() (auto_compact_window.rs:77).
+     *
+     * Note rs's `advance()` deliberately does NOT clear the prefill baseline —
+     * `Session::start_new_context_window` / `replace_history` do that separately
+     * (state/session.rs:122,200). Callers that rewrite history must therefore call
+     * `startNewContextWindow()` (or `clearPrefill()`) as well; see
+     * runCompactAndRecompute in session/turn.ts.
+     */
+    advance(): {
+        windowNumber: number;
+        ids: AutoCompactWindowIds;
+    };
+    /** mirrors Session::start_new_context_window (state/session.rs:199): advance
+     *  the window AND drop the stale prefill baseline in one step. */
+    startNewContextWindow(): {
+        windowNumber: number;
+        ids: AutoCompactWindowIds;
+    };
+    /** mirrors claim_token_budget_reminder (auto_compact_window.rs:88) — true only
+     *  the first time it is called within a window. */
+    claimTokenBudgetReminder(): boolean;
+    /** mirrors claim_auto_compact_fallback (auto_compact_window.rs:92) */
+    claimAutoCompactFallback(): boolean;
+    /** mirrors request_new_context_window (auto_compact_window.rs:96) — codex-rs
+     *  sets this from the `new_context` tool so the next mid-turn checkpoint rolls
+     *  the window over even when the token limit was not reached. codex-ts has no
+     *  such built-in tool, so a host can drive it from a custom tool. */
+    requestNewContextWindow(): void;
+    /** mirrors take_new_context_window_request (auto_compact_window.rs:100) */
+    takeNewContextWindowRequest(): boolean;
     /**
      * Records the request-input side of the first server usage sample.
      * Server-observed values take priority and are never overwritten.

package/dist/core/src/state/auto_compact_window.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auto_compact_window.d.ts","sourceRoot":"","sources":["../../../../core/src/state/auto_compact_window.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,MAAM,WAAW,yBAAyB;IACxC,OAAO,EAAE,MAAM,CAAC;IAChB,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;CACnC;AAED,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,OAAO,CAAK;IACpB;;;;OAIG;IACH,OAAO,CAAC,kBAAkB,CAAuB;IACjD,OAAO,CAAC,aAAa,CAAuC;IAE5D,YAAY,IAAI,IAAI;IAKpB,uEAAuE;IACvE,SAAS,IAAI,IAAI;IAKjB;;;;OAIG;IACH,2BAA2B,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAMtD;;;OAGG;IACH,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAMzC,QAAQ,IAAI,yBAAyB;IAIrC;;;OAGG;IACH,eAAe,CAAC,gBAAgB,EAAE,MAAM,GAAG,MAAM;CAIlD"}
+{"version":3,"file":"auto_compact_window.d.ts","sourceRoot":"","sources":["../../../../core/src/state/auto_compact_window.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH;;4EAE4E;AAC5E,MAAM,WAAW,oBAAoB;IACnC,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,QAAQ,EAAE,MAAM,CAAC;CAClB;AAeD,4EAA4E;AAC5E,wBAAgB,8BAA8B,IAAI,oBAAoB,CAGrE;AAED;wEACwE;AACxE,MAAM,WAAW,yBAAyB;IACxC,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;CACnC;AAED,qBAAa,iBAAiB;IAC5B;wCACoC;IACpC,OAAO,CAAC,YAAY,CAAK;IACzB,OAAO,CAAC,GAAG,CAA0D;IACrE,OAAO,CAAC,yBAAyB,CAAS;IAC1C;;;;OAIG;IACH,OAAO,CAAC,kBAAkB,CAAuB;IACjD,OAAO,CAAC,aAAa,CAAuC;IAC5D,OAAO,CAAC,4BAA4B,CAAS;IAC7C,OAAO,CAAC,4BAA4B,CAAS;IAE7C,YAAY,IAAI,IAAI;IAKpB,0DAA0D;IAC1D,mBAAmB,IAAI,MAAM;IAI7B,gDAAgD;IAChD,UAAU,IAAI,oBAAoB;IAIlC;wDACoD;IACpD,OAAO,CAAC,YAAY,EAAE,MAAM,EAAE,GAAG,EAAE,oBAAoB,GAAG,IAAI;IAK9D;;;;;;;;;OASG;IACH,OAAO,IAAI;QAAE,YAAY,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,oBAAoB,CAAA;KAAE;IAa9D;sEACkE;IAClE,qBAAqB,IAAI;QAAE,YAAY,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,oBAAoB,CAAA;KAAE;IAM5E;uDACmD;IACnD,wBAAwB,IAAI,OAAO;IAMnC,sEAAsE;IACtE,wBAAwB,IAAI,OAAO;IAMnC;;;yEAGqE;IACrE,uBAAuB,IAAI,IAAI;IAI/B,2EAA2E;IAC3E,2BAA2B,IAAI,OAAO;IAMtC;;;;OAIG;IACH,2BAA2B,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAMtD;;;OAGG;IACH,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAMzC,QAAQ,IAAI,yBAAyB;IAIrC;;;OAGG;IACH,eAAe,CAAC,gBAAgB,EAAE,MAAM,GAAG,MAAM;CAIlD"}

package/dist/core/src/state/auto_compact_window.js

@@ -5,8 +5,26 @@
  * BodyAfterPrefix mode can measure context growth since the last compaction
  * rather than total context size.
  */
+let windowIdCounter = 0;
+function newWindowId() {
+    const cryptoObj = globalThis.crypto;
+    if (typeof cryptoObj?.randomUUID === "function") {
+        return cryptoObj.randomUUID();
+    }
+    windowIdCounter += 1;
+    return `window-${Date.now().toString(36)}-${windowIdCounter}`;
+}
+/** mirrors AutoCompactWindowIds::new_initial (auto_compact_window.rs:12) */
+export function newInitialAutoCompactWindowIds() {
+    const windowId = newWindowId();
+    return { firstWindowId: windowId, previousWindowId: null, windowId };
+}
 export class AutoCompactWindow {
-    ordinal = 1;
+    /** mirrors window_number (auto_compact_window.rs:35) — starts at 0, not 1, and
+     *  advances once per compaction. */
+    windowNumber = 0;
+    ids = newInitialAutoCompactWindowIds();
+    newContextWindowRequested = false;
     /**
      * Absolute input-token baseline for the current window.
      * Set from the first server-observed usage after a new window opens;
@@ -14,14 +32,80 @@ export class AutoCompactWindow {
      */
     prefillInputTokens = null;
     prefillSource = null;
+    tokenBudgetReminderDelivered = false;
+    autoCompactFallbackDelivered = false;
     clearPrefill() {
         this.prefillInputTokens = null;
         this.prefillSource = null;
     }
-    /** Called after each compaction to start a fresh measurement window */
-    startNext() {
-        this.ordinal += 1;
+    /** mirrors window_number() (auto_compact_window.rs:64) */
+    currentWindowNumber() {
+        return this.windowNumber;
+    }
+    /** mirrors ids() (auto_compact_window.rs:68) */
+    currentIds() {
+        return { ...this.ids };
+    }
+    /** mirrors restore() (auto_compact_window.rs:72) — used when a resumed thread
+     *  replays its persisted compaction checkpoints. */
+    restore(windowNumber, ids) {
+        this.windowNumber = windowNumber;
+        this.ids = { ...ids };
+    }
+    /**
+     * Open the next compaction window: bump the number, rotate the ids, and reset
+     * the per-window one-shot flags. mirrors advance() (auto_compact_window.rs:77).
+     *
+     * Note rs's `advance()` deliberately does NOT clear the prefill baseline —
+     * `Session::start_new_context_window` / `replace_history` do that separately
+     * (state/session.rs:122,200). Callers that rewrite history must therefore call
+     * `startNewContextWindow()` (or `clearPrefill()`) as well; see
+     * runCompactAndRecompute in session/turn.ts.
+     */
+    advance() {
+        this.windowNumber += 1;
+        this.ids = {
+            firstWindowId: this.ids.firstWindowId,
+            previousWindowId: this.ids.windowId,
+            windowId: newWindowId(),
+        };
+        this.newContextWindowRequested = false;
+        this.tokenBudgetReminderDelivered = false;
+        this.autoCompactFallbackDelivered = false;
+        return { windowNumber: this.windowNumber, ids: this.currentIds() };
+    }
+    /** mirrors Session::start_new_context_window (state/session.rs:199): advance
+     *  the window AND drop the stale prefill baseline in one step. */
+    startNewContextWindow() {
+        const advanced = this.advance();
         this.clearPrefill();
+        return advanced;
+    }
+    /** mirrors claim_token_budget_reminder (auto_compact_window.rs:88) — true only
+     *  the first time it is called within a window. */
+    claimTokenBudgetReminder() {
+        const claimed = !this.tokenBudgetReminderDelivered;
+        this.tokenBudgetReminderDelivered = true;
+        return claimed;
+    }
+    /** mirrors claim_auto_compact_fallback (auto_compact_window.rs:92) */
+    claimAutoCompactFallback() {
+        const claimed = !this.autoCompactFallbackDelivered;
+        this.autoCompactFallbackDelivered = true;
+        return claimed;
+    }
+    /** mirrors request_new_context_window (auto_compact_window.rs:96) — codex-rs
+     *  sets this from the `new_context` tool so the next mid-turn checkpoint rolls
+     *  the window over even when the token limit was not reached. codex-ts has no
+     *  such built-in tool, so a host can drive it from a custom tool. */
+    requestNewContextWindow() {
+        this.newContextWindowRequested = true;
+    }
+    /** mirrors take_new_context_window_request (auto_compact_window.rs:100) */
+    takeNewContextWindowRequest() {
+        const requested = this.newContextWindowRequested;
+        this.newContextWindowRequested = false;
+        return requested;
     }
     /**
      * Records the request-input side of the first server usage sample.
@@ -45,7 +129,7 @@ export class AutoCompactWindow {
         this.prefillSource = "estimated";
     }
     snapshot() {
-        return { ordinal: this.ordinal, prefillInputTokens: this.prefillInputTokens };
+        return { prefillInputTokens: this.prefillInputTokens };
     }
     /**
      * Tokens added since the start of this window (BodyAfterPrefix mode).

package/dist/core/src/state/auto_compact_window.js.map

@@ -1 +1 @@
-{"version":3,"file":"auto_compact_window.js","sourceRoot":"","sources":["../../../../core/src/state/auto_compact_window.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAOH,MAAM,OAAO,iBAAiB;IACpB,OAAO,GAAG,CAAC,CAAC;IACpB;;;;OAIG;IACK,kBAAkB,GAAkB,IAAI,CAAC;IACzC,aAAa,GAAkC,IAAI,CAAC;IAE5D,YAAY;QACV,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC;QAC/B,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;IAC5B,CAAC;IAED,uEAAuE;IACvE,SAAS;QACP,IAAI,CAAC,OAAO,IAAI,CAAC,CAAC;QAClB,IAAI,CAAC,YAAY,EAAE,CAAC;IACtB,CAAC;IAED;;;;OAIG;IACH,2BAA2B,CAAC,WAAmB;QAC7C,IAAI,IAAI,CAAC,aAAa,KAAK,QAAQ;YAAE,OAAO;QAC5C,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC;QACnD,IAAI,CAAC,aAAa,GAAG,QAAQ,CAAC;IAChC,CAAC;IAED;;;OAGG;IACH,mBAAmB,CAAC,MAAc;QAChC,IAAI,IAAI,CAAC,aAAa,KAAK,QAAQ;YAAE,OAAO;QAC5C,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;QAC9C,IAAI,CAAC,aAAa,GAAG,WAAW,CAAC;IACnC,CAAC;IAED,QAAQ;QACN,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,kBAAkB,EAAE,IAAI,CAAC,kBAAkB,EAAE,CAAC;IAChF,CAAC;IAED;;;OAGG;IACH,eAAe,CAAC,gBAAwB;QACtC,MAAM,QAAQ,GAAG,IAAI,CAAC,kBAAkB,IAAI,gBAAgB,CAAC;QAC7D,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,gBAAgB,GAAG,QAAQ,CAAC,CAAC;IAClD,CAAC;CACF"}
+{"version":3,"file":"auto_compact_window.js","sourceRoot":"","sources":["../../../../core/src/state/auto_compact_window.ts"],"names":[],"mappings":"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"}

package/dist/core/src/tools/handlers/request_user_input_spec.d.ts

@@ -3,8 +3,15 @@
  */
 import type { ToolSpec } from "../../../../tools/src/tool_spec.js";
 export declare const REQUEST_USER_INPUT_TOOL_NAME = "request_user_input";
+/** mirrors MIN/MAX_AUTO_RESOLUTION_MS (request_user_input_spec.rs:9-10) */
+export declare const MIN_AUTO_RESOLUTION_MS = 60000;
+export declare const MAX_AUTO_RESOLUTION_MS = 240000;
 export declare function createRequestUserInputTool(): ToolSpec;
-/** Normalise args from the model: ensure options exist and set isOther = true */
+/**
+ * Normalise args from the model: ensure options exist, set isOther = true, and
+ * clamp autoResolutionMs into the supported range.
+ * mirrors normalize_request_user_input_args (request_user_input_spec.rs:104).
+ */
 export declare function normalizeRequestUserInputArgs(args: {
     questions?: {
         id: string;
@@ -17,8 +24,10 @@ export declare function normalizeRequestUserInputArgs(args: {
         isOther?: boolean;
         isSecret?: boolean;
     }[];
+    autoResolutionMs?: unknown;
 }): {
     questions: import("../../../../protocol/src/request_user_input.js").RequestUserInputQuestion[];
+    autoResolutionMs?: number | undefined;
 } | {
     error: string;
 };

package/dist/core/src/tools/handlers/request_user_input_spec.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"request_user_input_spec.d.ts","sourceRoot":"","sources":["../../../../../core/src/tools/handlers/request_user_input_spec.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oCAAoC,CAAC;AAGnE,eAAO,MAAM,4BAA4B,uBAAuB,CAAC;AAEjE,wBAAgB,0BAA0B,IAAI,QAAQ,CAgDrD;AAED,iFAAiF;AACjF,wBAAgB,6BAA6B,CAAC,IAAI,EAAE;IAClD,SAAS,CAAC,EAAE;QACV,EAAE,EAAE,MAAM,CAAC;QACX,MAAM,EAAE,MAAM,CAAC;QACf,QAAQ,EAAE,MAAM,CAAC;QACjB,OAAO,CAAC,EAAE;YAAE,KAAK,EAAE,MAAM,CAAC;YAAC,WAAW,EAAE,MAAM,CAAA;SAAE,EAAE,CAAC;QACnD,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;KACpB,EAAE,CAAC;CACL,GAAG;IAAE,SAAS,EAAE,OAAO,gDAAgD,EAAE,wBAAwB,EAAE,CAAA;CAAE,GAAG;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CA0BzH"}
+{"version":3,"file":"request_user_input_spec.d.ts","sourceRoot":"","sources":["../../../../../core/src/tools/handlers/request_user_input_spec.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oCAAoC,CAAC;AAGnE,eAAO,MAAM,4BAA4B,uBAAuB,CAAC;AACjE,2EAA2E;AAC3E,eAAO,MAAM,sBAAsB,QAAS,CAAC;AAC7C,eAAO,MAAM,sBAAsB,SAAU,CAAC;AAE9C,wBAAgB,0BAA0B,IAAI,QAAQ,CAgErD;AAED;;;;GAIG;AACH,wBAAgB,6BAA6B,CAAC,IAAI,EAAE;IAClD,SAAS,CAAC,EAAE;QACV,EAAE,EAAE,MAAM,CAAC;QACX,MAAM,EAAE,MAAM,CAAC;QACf,QAAQ,EAAE,MAAM,CAAC;QACjB,OAAO,CAAC,EAAE;YAAE,KAAK,EAAE,MAAM,CAAC;YAAC,WAAW,EAAE,MAAM,CAAA;SAAE,EAAE,CAAC;QACnD,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;KACpB,EAAE,CAAC;IACJ,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B,GACG;IACE,SAAS,EAAE,OAAO,gDAAgD,EAAE,wBAAwB,EAAE,CAAC;IAC/F,gBAAgB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACvC,GACD;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CAuCpB"}