tailii-host 0.1.1 → 0.4.0

package/dist/codex/codexToolActivity.d.ts

@@ -0,0 +1,69 @@
+import { type ControlMessage, type ToolActivity } from "../protocol.js";
+/** codex の変更 1 件の正規化表現（live changes[] / rollout patch_apply_end changes の共通形）。 */
+export interface CodexFileChange {
+    path: string;
+    kind: "add" | "update" | "delete";
+    /** add は生 content、update は unified diff hunk。delete は null のことがある。 */
+    diff: string | null;
+    movePath: string | null;
+}
+/** codex プラン（update_plan / turn/plan/updated）の 1 ステップ。 */
+export interface CodexPlanStep {
+    step: string;
+    status: string;
+}
+/** tool_activity 封筒を作る（hub の publish 経路へそのまま流せる形）。 */
+export declare function toolActivityMessage(activity: ToolActivity): ControlMessage;
+/** コマンド実行カード。rawCommand は shell ラッパーを剥がしてから渡す必要はない（内部で正規化）。 */
+export declare function codexCommandActivity(id: string, rawCommand: string): ToolActivity;
+/**
+ * ファイル変更カード（changes 1 件 = 1 カード）。id は先頭変更が `idBase`、以降 `idBase#n`。
+ * live の fileChange item と rollout の patch_apply_end は同じ changes 並びを持つため、
+ * この規則で id も系統間で一致する。
+ */
+export declare function codexFileChangeActivities(idBase: string, changes: CodexFileChange[]): ToolActivity[];
+/** プラン更新カード（Claude の TodoWrite と同じ表示系へ載せる）。 */
+export declare function codexPlanActivity(id: string, steps: CodexPlanStep[]): ToolActivity;
+/**
+ * live / rollout 照合用の content key。id は系統間で一致しないため含めない。
+ * diff 本文は add（content）/ update（unified diff）とも系統間で一致するが、キーは
+ * 行数サマリで代表させて、キャップ切り詰めの影響を受けないようにする。
+ */
+export declare function toolActivityContentKey(activity: ToolActivity): string;
+/**
+ * item/completed の item から tool_activity 群を作る。
+ * commandExecution: declined（承認拒否で未実行）以外を表示する。
+ * fileChange: 適用済み（completed）のみ。rollout 側の patch_apply_end(success) と対になる。
+ */
+export declare function codexItemToolActivities(item: Record<string, unknown>): ToolActivity[];
+/** turn/plan/updated の params からプランカードを作る（plan が空なら null）。 */
+export declare function codexPlanUpdateActivity(id: string, params: Record<string, unknown>): ToolActivity | null;
+/**
+ * rollout の response_item payload から tool_activity 群を作る。
+ * - custom_tool_call "exec": JS 入力から `tools.exec_command({cmd})` を抽出（複数可）。
+ *   `tools.apply_patch` は patch_apply_end 側で表示するためここでは作らない。
+ *   どちらも抽出できない JS は「スクリプト実行」1 カードにする（live 側とキーが一致しない
+ *   可能性を許容 — 再接続の再走査でだけ重複しうる既知の限界）。
+ * - function_call "exec_command": arguments JSON の cmd を使う（旧ハーネス互換）。
+ * - function_call "update_plan": arguments JSON の plan をプランカードへ。
+ */
+export declare function rolloutResponseItemToolActivities(payload: Record<string, unknown>): ToolActivity[];
+/**
+ * rollout の event_msg patch_apply_end からファイル変更カードを作る。
+ * changes はパス→種別のマップで、live の fileChange item と同一の並び・内容を持つ。
+ * success=false（適用失敗）は live 側も completed にならないため作らない。
+ */
+export declare function rolloutPatchApplyActivities(payload: Record<string, unknown>): ToolActivity[];
+/**
+ * unifiedExecStartup の shell ラッパー（`/bin/zsh -lc '<cmd>'` 等）を剥がす。
+ * rollout 側は生コマンドのまま記録されるため、両系統をこの関数で同じ文字列に揃える。
+ */
+export declare function normalizeShellCommand(raw: string): string;
+/**
+ * unified exec の JS 入力から `tools.exec_command({...cmd...})` のコマンド文字列を列挙する。
+ * 入力はモデル生成の JS なのでキーはクォート有無どちらもあり得る。cmd の値が
+ * 文字列リテラル（JSON 互換のダブルクォート）で書かれている呼び出しだけを抽出する。
+ */
+export declare function extractExecCommands(input: string): string[];
+/** JS 入力が apply_patch 呼び出しを含むか（patch_apply_end 側で表示するため exec カードを抑止）。 */
+export declare function containsApplyPatch(input: string): boolean;

package/dist/codex/codexToolActivity.js

@@ -0,0 +1,425 @@
+// codexToolActivity.ts
+// tailii (TS host) — codex のコマンド実行 / ファイル変更 / プラン更新を tool_activity へ写像する。
+//
+// 生成元は 2 系統あり、同一イベントが両方に現れる:
+//   - live: App Server の item/completed（commandExecution / fileChange）と turn/plan/updated
+//   - rollout: response_item（custom_tool_call "exec" / function_call "exec_command" /
+//     "update_plan"）と event_msg patch_apply_end
+// SessionHub は chatContentKey の occurrence count で live / rollout を照合するため、
+// 両系統が「同じイベントから同じ ToolActivity（同じ content key）」を作ることが要件。
+// このモジュールに builder を集約し、正規化（shell ラッパー剥がし・status の snake_case 化）を
+// 両系統で共有する。id は系統間で一致しない（live: exec-uuid / rollout: call_id）ため
+// content key には含めない。
+//
+// 実形式の正本（2026-07-23, codex-cli 0.145 で採取）:
+//   - live commandExecution.command = `/bin/zsh -lc '<cmd>'`（unifiedExecStartup ラップ）
+//   - rollout custom_tool_call "exec" の input = JS で `tools.exec_command({"cmd":"<cmd>",…})`
+//   - fileChange は live item.id == rollout patch_apply_end.call_id、diff 文字列も一致
+//     （add は生 content / update は unified diff hunk）
+//   - plan status は live "inProgress"（camel）/ rollout "in_progress"（snake）
+import * as path from "node:path";
+import { PROTOCOL_V1, } from "../protocol.js";
+// transcriptTailer（claude 側）と同じキャップ値。iOS 表示の前提を揃える。
+const MAX_COMMAND_CHARACTERS = 8_000;
+const MAX_DIFF_FIELD_CHARACTERS = 24_000;
+const MAX_TODO_ITEMS = 50;
+const MAX_TODO_CONTENT_CHARACTERS = 300;
+/** tool_activity 封筒を作る（hub の publish 経路へそのまま流せる形）。 */
+export function toolActivityMessage(activity) {
+    return { type: "tool_activity", v: PROTOCOL_V1, activity };
+}
+// MARK: - builder（live / rollout 共通）
+/** コマンド実行カード。rawCommand は shell ラッパーを剥がしてから渡す必要はない（内部で正規化）。 */
+export function codexCommandActivity(id, rawCommand) {
+    const command = normalizeShellCommand(rawCommand);
+    const commandCap = cap(command, MAX_COMMAND_CHARACTERS);
+    const activity = {
+        id,
+        name: "Bash",
+        label: `実行済み ${commandPrefix(commandCap.value ?? "")}`,
+        commandTruncated: commandCap.truncated,
+        descriptionTruncated: false,
+    };
+    if (commandCap.value !== null && commandCap.value.length > 0)
+        activity.command = commandCap.value;
+    return activity;
+}
+/**
+ * ファイル変更カード（changes 1 件 = 1 カード）。id は先頭変更が `idBase`、以降 `idBase#n`。
+ * live の fileChange item と rollout の patch_apply_end は同じ changes 並びを持つため、
+ * この規則で id も系統間で一致する。
+ */
+export function codexFileChangeActivities(idBase, changes) {
+    return changes.map((change, index) => {
+        const id = index === 0 ? idBase : `${idBase}#${index}`;
+        const base = path.basename(change.path);
+        const display = base.length === 0 ? change.path : base;
+        if (change.kind === "add") {
+            const newCap = cap(change.diff, MAX_DIFF_FIELD_CHARACTERS);
+            const diff = { oldStringTruncated: false, newStringTruncated: newCap.truncated };
+            if (newCap.value !== null)
+                diff.newString = newCap.value;
+            return {
+                id,
+                name: "Write",
+                label: `作成済み ${display}`,
+                file: change.path,
+                addedLines: countLines(change.diff),
+                removedLines: 0,
+                diff,
+                commandTruncated: false,
+                descriptionTruncated: false,
+            };
+        }
+        if (change.kind === "delete") {
+            return {
+                id,
+                name: "Edit",
+                label: `削除済み ${display}`,
+                file: change.path,
+                commandTruncated: false,
+                descriptionTruncated: false,
+            };
+        }
+        const split = splitUnifiedDiff(change.diff ?? "");
+        const oldCap = cap(split.oldText, MAX_DIFF_FIELD_CHARACTERS);
+        const newCap = cap(split.newText, MAX_DIFF_FIELD_CHARACTERS);
+        const diff = {
+            oldStringTruncated: oldCap.truncated,
+            newStringTruncated: newCap.truncated,
+        };
+        if (oldCap.value !== null)
+            diff.oldString = oldCap.value;
+        if (newCap.value !== null)
+            diff.newString = newCap.value;
+        const activity = {
+            id,
+            name: "Edit",
+            label: `編集済み ${display}`,
+            file: change.path,
+            addedLines: split.added,
+            removedLines: split.removed,
+            diff,
+            commandTruncated: false,
+            descriptionTruncated: false,
+        };
+        return activity;
+    });
+}
+/** プラン更新カード（Claude の TodoWrite と同じ表示系へ載せる）。 */
+export function codexPlanActivity(id, steps) {
+    const todos = steps.slice(0, MAX_TODO_ITEMS).flatMap((item) => {
+        const content = item.step.trim();
+        if (content.length === 0)
+            return [];
+        return [{
+                content: cap(content, MAX_TODO_CONTENT_CHARACTERS).value ?? content,
+                status: normalizePlanStatus(item.status),
+            }];
+    });
+    const activity = {
+        id,
+        name: "TodoWrite",
+        label: "プランを更新しました",
+        commandTruncated: false,
+        descriptionTruncated: false,
+    };
+    if (todos.length > 0)
+        activity.todos = todos;
+    return activity;
+}
+/**
+ * live / rollout 照合用の content key。id は系統間で一致しないため含めない。
+ * diff 本文は add（content）/ update（unified diff）とも系統間で一致するが、キーは
+ * 行数サマリで代表させて、キャップ切り詰めの影響を受けないようにする。
+ */
+export function toolActivityContentKey(activity) {
+    const todos = (activity.todos ?? []).map((todo) => `${todo.content}=${todo.status}`).join("
");
+    return [
+        "tool",
+        activity.name,
+        activity.label,
+        activity.command ?? "",
+        activity.file ?? "",
+        String(activity.addedLines ?? ""),
+        String(activity.removedLines ?? ""),
+        todos,
+    ].join("\u0000");
+}
+// MARK: - live（App Server item）→ ToolActivity
+/**
+ * item/completed の item から tool_activity 群を作る。
+ * commandExecution: declined（承認拒否で未実行）以外を表示する。
+ * fileChange: 適用済み（completed）のみ。rollout 側の patch_apply_end(success) と対になる。
+ */
+export function codexItemToolActivities(item) {
+    const id = item["id"];
+    const type = item["type"];
+    if (typeof id !== "string" || id.length === 0)
+        return [];
+    if (type === "commandExecution") {
+        const command = item["command"];
+        const status = item["status"];
+        if (typeof command !== "string" || command.length === 0)
+            return [];
+        if (status !== "completed" && status !== "failed")
+            return [];
+        return [codexCommandActivity(id, command)];
+    }
+    if (type === "fileChange") {
+        if (item["status"] !== "completed")
+            return [];
+        const changes = parseLiveFileChanges(item["changes"]);
+        return codexFileChangeActivities(id, changes);
+    }
+    return [];
+}
+function parseLiveFileChanges(value) {
+    if (!Array.isArray(value))
+        return [];
+    return value.flatMap((entry) => {
+        const record = asRecord(entry);
+        const changePath = record?.["path"];
+        if (typeof changePath !== "string" || changePath.length === 0)
+            return [];
+        const kindRecord = asRecord(record?.["kind"]);
+        const kindType = kindRecord?.["type"];
+        const kind = kindType === "add" || kindType === "delete" ? kindType : "update";
+        const diff = typeof record?.["diff"] === "string" ? record["diff"] : null;
+        const movePath = typeof kindRecord?.["move_path"] === "string" ? kindRecord["move_path"] : null;
+        return [{ path: changePath, kind, diff, movePath }];
+    });
+}
+/** turn/plan/updated の params からプランカードを作る（plan が空なら null）。 */
+export function codexPlanUpdateActivity(id, params) {
+    const steps = parsePlanSteps(params["plan"]);
+    if (steps.length === 0)
+        return null;
+    return codexPlanActivity(id, steps);
+}
+// MARK: - rollout（response_item / event_msg）→ ToolActivity
+/**
+ * rollout の response_item payload から tool_activity 群を作る。
+ * - custom_tool_call "exec": JS 入力から `tools.exec_command({cmd})` を抽出（複数可）。
+ *   `tools.apply_patch` は patch_apply_end 側で表示するためここでは作らない。
+ *   どちらも抽出できない JS は「スクリプト実行」1 カードにする（live 側とキーが一致しない
+ *   可能性を許容 — 再接続の再走査でだけ重複しうる既知の限界）。
+ * - function_call "exec_command": arguments JSON の cmd を使う（旧ハーネス互換）。
+ * - function_call "update_plan": arguments JSON の plan をプランカードへ。
+ */
+export function rolloutResponseItemToolActivities(payload) {
+    const kind = payload["type"];
+    const name = payload["name"];
+    const idBase = firstString(payload["call_id"], payload["id"]) ?? null;
+    if (idBase === null)
+        return [];
+    if (kind === "custom_tool_call" && name === "exec") {
+        const input = payload["input"];
+        if (typeof input !== "string" || input.length === 0)
+            return [];
+        const commands = extractExecCommands(input);
+        if (commands.length > 0) {
+            return commands.map((command, index) => codexCommandActivity(index === 0 ? idBase : `${idBase}#${index}`, command));
+        }
+        if (containsApplyPatch(input))
+            return [];
+        return [codexCommandActivity(idBase, input)];
+    }
+    if (kind === "function_call" && name === "exec_command") {
+        const args = parseJsonRecord(payload["arguments"]);
+        const cmd = args?.["cmd"];
+        if (typeof cmd !== "string" || cmd.length === 0)
+            return [];
+        return [codexCommandActivity(idBase, cmd)];
+    }
+    if (kind === "function_call" && name === "update_plan") {
+        const args = parseJsonRecord(payload["arguments"]);
+        const steps = parsePlanSteps(args?.["plan"]);
+        if (steps.length === 0)
+            return [];
+        return [codexPlanActivity(idBase, steps)];
+    }
+    return [];
+}
+/**
+ * rollout の event_msg patch_apply_end からファイル変更カードを作る。
+ * changes はパス→種別のマップで、live の fileChange item と同一の並び・内容を持つ。
+ * success=false（適用失敗）は live 側も completed にならないため作らない。
+ */
+export function rolloutPatchApplyActivities(payload) {
+    if (payload["success"] !== true)
+        return [];
+    const callId = firstString(payload["call_id"]);
+    const changesRecord = asRecord(payload["changes"]);
+    if (callId === null || changesRecord === null)
+        return [];
+    const changes = [];
+    for (const [changePath, rawChange] of Object.entries(changesRecord)) {
+        const change = asRecord(rawChange);
+        if (change === null)
+            continue;
+        const kindType = change["type"];
+        const kind = kindType === "add" || kindType === "delete" ? kindType : "update";
+        const diff = typeof change["unified_diff"] === "string"
+            ? change["unified_diff"]
+            : typeof change["content"] === "string"
+                ? change["content"]
+                : null;
+        const movePath = typeof change["move_path"] === "string" ? change["move_path"] : null;
+        changes.push({ path: changePath, kind, diff, movePath });
+    }
+    return codexFileChangeActivities(callId, changes);
+}
+// MARK: - 正規化ヘルパ
+/**
+ * unifiedExecStartup の shell ラッパー（`/bin/zsh -lc '<cmd>'` 等）を剥がす。
+ * rollout 側は生コマンドのまま記録されるため、両系統をこの関数で同じ文字列に揃える。
+ */
+export function normalizeShellCommand(raw) {
+    const trimmed = raw.trim();
+    const match = /^(?:\/bin\/)?(?:zsh|bash|sh)\s+-lc\s+'([\s\S]*)'$/.exec(trimmed);
+    const inner = match?.[1];
+    if (inner === undefined)
+        return trimmed;
+    return inner.replaceAll("'\\''", "'");
+}
+/**
+ * unified exec の JS 入力から `tools.exec_command({...cmd...})` のコマンド文字列を列挙する。
+ * 入力はモデル生成の JS なのでキーはクォート有無どちらもあり得る。cmd の値が
+ * 文字列リテラル（JSON 互換のダブルクォート）で書かれている呼び出しだけを抽出する。
+ */
+export function extractExecCommands(input) {
+    // 呼び出しごとに探索区間を「次の exec_command 呼び出しの手前」までに区切る。
+    // 区切らないと cmd が文字列リテラルでない呼び出しが、後続呼び出しの cmd を
+    // 横取りして同じコマンドを二重に数えてしまう。
+    const callPattern = /tools\s*\.\s*exec_command\s*\(/g;
+    const segmentStarts = [];
+    const callStarts = [];
+    let call;
+    while ((call = callPattern.exec(input)) !== null) {
+        callStarts.push(call.index);
+        segmentStarts.push(call.index + call[0].length);
+    }
+    const commands = [];
+    segmentStarts.forEach((start, index) => {
+        const end = index + 1 < callStarts.length ? callStarts[index + 1] : input.length;
+        const segment = input.slice(start, end);
+        const cmdLiteral = /(?:"cmd"|'cmd'|\bcmd)\s*:\s*("(?:[^"\\]|\\[\s\S])*")/.exec(segment)?.[1];
+        if (cmdLiteral === undefined)
+            return;
+        try {
+            const value = JSON.parse(cmdLiteral);
+            if (typeof value === "string" && value.length > 0)
+                commands.push(value);
+        }
+        catch {
+            // モデル生成 JS の破損リテラルは黙って読み飛ばす。
+        }
+    });
+    return commands;
+}
+/** JS 入力が apply_patch 呼び出しを含むか（patch_apply_end 側で表示するため exec カードを抑止）。 */
+export function containsApplyPatch(input) {
+    return /tools\s*\.\s*apply_patch\s*\(/.test(input);
+}
+/** live "inProgress"（camel）と rollout "in_progress"（snake）を Claude 互換の snake へ揃える。 */
+function normalizePlanStatus(status) {
+    if (status === "inProgress")
+        return "in_progress";
+    return status;
+}
+function parsePlanSteps(value) {
+    if (!Array.isArray(value))
+        return [];
+    return value.flatMap((entry) => {
+        const record = asRecord(entry);
+        const step = record?.["step"];
+        if (typeof step !== "string" || step.length === 0)
+            return [];
+        const status = typeof record?.["status"] === "string" ? record["status"] : "pending";
+        return [{ step, status }];
+    });
+}
+/** unified diff hunk 群を old/new テキストへ分解し、増減行数を数える。 */
+function splitUnifiedDiff(diff) {
+    const oldLines = [];
+    const newLines = [];
+    let added = 0;
+    let removed = 0;
+    for (const line of diff.split("\n")) {
+        if (line.startsWith("@@"))
+            continue;
+        // `` マーカー。内容行なら先頭に空白が付くため素の `\` は
+        // マーカーだけで、old/new どちらのテキストにも数えない。
+        if (line.startsWith("\\"))
+            continue;
+        if (line.startsWith("+")) {
+            newLines.push(line.slice(1));
+            added += 1;
+        }
+        else if (line.startsWith("-")) {
+            oldLines.push(line.slice(1));
+            removed += 1;
+        }
+        else {
+            const body = line.startsWith(" ") ? line.slice(1) : line;
+            oldLines.push(body);
+            newLines.push(body);
+        }
+    }
+    // 末尾の空行（diff 終端の改行由来）は表示ノイズなので落とす。
+    while (oldLines.length > 0 && oldLines[oldLines.length - 1] === "")
+        oldLines.pop();
+    while (newLines.length > 0 && newLines[newLines.length - 1] === "")
+        newLines.pop();
+    return {
+        oldText: oldLines.length > 0 ? oldLines.join("\n") : null,
+        newText: newLines.length > 0 ? newLines.join("\n") : null,
+        added,
+        removed,
+    };
+}
+function countLines(text) {
+    if (text === null || text.length === 0)
+        return 0;
+    const withoutTrailing = text.endsWith("\n") ? text.slice(0, -1) : text;
+    if (withoutTrailing.length === 0)
+        return 0;
+    return withoutTrailing.split("\n").length;
+}
+function commandPrefix(command) {
+    const trimmed = command.trim();
+    if (trimmed.length === 0)
+        return "コマンド";
+    return trimmed.length > 80 ? trimmed.slice(0, 80) + "..." : trimmed;
+}
+function cap(text, limit) {
+    if (text === null)
+        return { value: null, truncated: false };
+    if (text.length <= limit)
+        return { value: text, truncated: false };
+    return { value: text.slice(0, limit), truncated: true };
+}
+function parseJsonRecord(value) {
+    if (typeof value !== "string")
+        return asRecord(value);
+    try {
+        return asRecord(JSON.parse(value));
+    }
+    catch {
+        return null;
+    }
+}
+function firstString(...values) {
+    for (const value of values) {
+        if (typeof value === "string" && value.length > 0)
+            return value;
+    }
+    return null;
+}
+function asRecord(value) {
+    return typeof value === "object" && value !== null && !Array.isArray(value)
+        ? value
+        : null;
+}
+//# sourceMappingURL=codexToolActivity.js.map

package/dist/codex/codexToolActivity.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"codexToolActivity.js","sourceRoot":"","sources":["../../src/codex/codexToolActivity.ts"],"names":[],"mappings":"AAAA,uBAAuB;AACvB,0EAA0E;AAC1E,EAAE;AACF,6BAA6B;AAC7B,0FAA0F;AAC1F,sFAAsF;AACtF,gDAAgD;AAChD,2EAA2E;AAC3E,yDAAyD;AACzD,kEAAkE;AAClE,+DAA+D;AAC/D,sBAAsB;AACtB,EAAE;AACF,2CAA2C;AAC3C,qFAAqF;AACrF,6FAA6F;AAC7F,+EAA+E;AAC/E,oDAAoD;AACpD,2EAA2E;AAE3E,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EACL,WAAW,GAKZ,MAAM,gBAAgB,CAAC;AAExB,oDAAoD;AACpD,MAAM,sBAAsB,GAAG,KAAK,CAAC;AACrC,MAAM,yBAAyB,GAAG,MAAM,CAAC;AACzC,MAAM,cAAc,GAAG,EAAE,CAAC;AAC1B,MAAM,2BAA2B,GAAG,GAAG,CAAC;AAiBxC,sDAAsD;AACtD,MAAM,UAAU,mBAAmB,CAAC,QAAsB;IACxD,OAAO,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC,EAAE,WAAW,EAAE,QAAQ,EAAE,CAAC;AAC7D,CAAC;AAED,qCAAqC;AAErC,+DAA+D;AAC/D,MAAM,UAAU,oBAAoB,CAAC,EAAU,EAAE,UAAkB;IACjE,MAAM,OAAO,GAAG,qBAAqB,CAAC,UAAU,CAAC,CAAC;IAClD,MAAM,UAAU,GAAG,GAAG,CAAC,OAAO,EAAE,sBAAsB,CAAC,CAAC;IACxD,MAAM,QAAQ,GAAiB;QAC7B,EAAE;QACF,IAAI,EAAE,MAAM;QACZ,KAAK,EAAE,QAAQ,aAAa,CAAC,UAAU,CAAC,KAAK,IAAI,EAAE,CAAC,EAAE;QACtD,gBAAgB,EAAE,UAAU,CAAC,SAAS;QACtC,oBAAoB,EAAE,KAAK;KAC5B,CAAC;IACF,IAAI,UAAU,CAAC,KAAK,KAAK,IAAI,IAAI,UAAU,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC;QAAE,QAAQ,CAAC,OAAO,GAAG,UAAU,CAAC,KAAK,CAAC;IAClG,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,yBAAyB,CAAC,MAAc,EAAE,OAA0B;IAClF,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;QACnC,MAAM,EAAE,GAAG,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,IAAI,KAAK,EAAE,CAAC;QACvD,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACxC,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;QACvD,IAAI,MAAM,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;YAC1B,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,yBAAyB,CAAC,CAAC;YAC3D,MAAM,IAAI,GAAqB,EAAE,kBAAkB,EAAE,KAAK,EAAE,kBAAkB,EAAE,MAAM,CAAC,SAAS,EAAE,CAAC;YACnG,IAAI,MAAM,CAAC,KAAK,KAAK,IAAI;gBAAE,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC;YACzD,OAAO;gBACL,EAAE;gBACF,IAAI,EAAE,OAAO;gBACb,KAAK,EAAE,QAAQ,OAAO,EAAE;gBACxB,IAAI,EAAE,MAAM,CAAC,IAAI;gBACjB,UAAU,EAAE,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC;gBACnC,YAAY,EAAE,CAAC;gBACf,IAAI;gBACJ,gBAAgB,EAAE,KAAK;gBACvB,oBAAoB,EAAE,KAAK;aAC5B,CAAC;QACJ,CAAC;QACD,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC7B,OAAO;gBACL,EAAE;gBACF,IAAI,EAAE,MAAM;gBACZ,KAAK,EAAE,QAAQ,OAAO,EAAE;gBACxB,IAAI,EAAE,MAAM,CAAC,IAAI;gBACjB,gBAAgB,EAAE,KAAK;gBACvB,oBAAoB,EAAE,KAAK;aAC5B,CAAC;QACJ,CAAC;QACD,MAAM,KAAK,GAAG,gBAAgB,CAAC,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;QAClD,MAAM,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,OAAO,EAAE,yBAAyB,CAAC,CAAC;QAC7D,MAAM,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,OAAO,EAAE,yBAAyB,CAAC,CAAC;QAC7D,MAAM,IAAI,GAAqB;YAC7B,kBAAkB,EAAE,MAAM,CAAC,SAAS;YACpC,kBAAkB,EAAE,MAAM,CAAC,SAAS;SACrC,CAAC;QACF,IAAI,MAAM,CAAC,KAAK,KAAK,IAAI;YAAE,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC;QACzD,IAAI,MAAM,CAAC,KAAK,KAAK,IAAI;YAAE,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC;QACzD,MAAM,QAAQ,GAAiB;YAC7B,EAAE;YACF,IAAI,EAAE,MAAM;YACZ,KAAK,EAAE,QAAQ,OAAO,EAAE;YACxB,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,UAAU,EAAE,KAAK,CAAC,KAAK;YACvB,YAAY,EAAE,KAAK,CAAC,OAAO;YAC3B,IAAI;YACJ,gBAAgB,EAAE,KAAK;YACvB,oBAAoB,EAAE,KAAK;SAC5B,CAAC;QACF,OAAO,QAAQ,CAAC;IAClB,CAAC,CAAC,CAAC;AACL,CAAC;AAED,+CAA+C;AAC/C,MAAM,UAAU,iBAAiB,CAAC,EAAU,EAAE,KAAsB;IAClE,MAAM,KAAK,GAAuB,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QAChF,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QACjC,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,EAAE,CAAC;QACpC,OAAO,CAAC;gBACN,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,2BAA2B,CAAC,CAAC,KAAK,IAAI,OAAO;gBACnE,MAAM,EAAE,mBAAmB,CAAC,IAAI,CAAC,MAAM,CAAC;aACzC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IACH,MAAM,QAAQ,GAAiB;QAC7B,EAAE;QACF,IAAI,EAAE,WAAW;QACjB,KAAK,EAAE,YAAY;QACnB,gBAAgB,EAAE,KAAK;QACvB,oBAAoB,EAAE,KAAK;KAC5B,CAAC;IACF,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC;QAAE,QAAQ,CAAC,KAAK,GAAG,KAAK,CAAC;IAC7C,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,sBAAsB,CAAC,QAAsB;IAC3D,MAAM,KAAK,GAAG,CAAC,QAAQ,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC/F,OAAO;QACL,MAAM;QACN,QAAQ,CAAC,IAAI;QACb,QAAQ,CAAC,KAAK;QACd,QAAQ,CAAC,OAAO,IAAI,EAAE;QACtB,QAAQ,CAAC,IAAI,IAAI,EAAE;QACnB,MAAM,CAAC,QAAQ,CAAC,UAAU,IAAI,EAAE,CAAC;QACjC,MAAM,CAAC,QAAQ,CAAC,YAAY,IAAI,EAAE,CAAC;QACnC,KAAK;KACN,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;AACnB,CAAC;AAED,8CAA8C;AAE9C;;;;GAIG;AACH,MAAM,UAAU,uBAAuB,CAAC,IAA6B;IACnE,MAAM,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC;IACtB,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC;IAC1B,IAAI,OAAO,EAAE,KAAK,QAAQ,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IACzD,IAAI,IAAI,KAAK,kBAAkB,EAAE,CAAC;QAChC,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC;QAChC,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC9B,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,EAAE,CAAC;QACnE,IAAI,MAAM,KAAK,WAAW,IAAI,MAAM,KAAK,QAAQ;YAAE,OAAO,EAAE,CAAC;QAC7D,OAAO,CAAC,oBAAoB,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC;IAC7C,CAAC;IACD,IAAI,IAAI,KAAK,YAAY,EAAE,CAAC;QAC1B,IAAI,IAAI,CAAC,QAAQ,CAAC,KAAK,WAAW;YAAE,OAAO,EAAE,CAAC;QAC9C,MAAM,OAAO,GAAG,oBAAoB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;QACtD,OAAO,yBAAyB,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;IAChD,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,SAAS,oBAAoB,CAAC,KAAc;IAC1C,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IACrC,OAAO,KAAK,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;QAC7B,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;QAC/B,MAAM,UAAU,GAAG,MAAM,EAAE,CAAC,MAAM,CAAC,CAAC;QACpC,IAAI,OAAO,UAAU,KAAK,QAAQ,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,EAAE,CAAC;QACzE,MAAM,UAAU,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;QAC9C,MAAM,QAAQ,GAAG,UAAU,EAAE,CAAC,MAAM,CAAC,CAAC;QACtC,MAAM,IAAI,GAAG,QAAQ,KAAK,KAAK,IAAI,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC;QAC/E,MAAM,IAAI,GAAG,OAAO,MAAM,EAAE,CAAC,MAAM,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAE,MAAM,CAAC,MAAM,CAAY,CAAC,CAAC,CAAC,IAAI,CAAC;QACtF,MAAM,QAAQ,GAAG,OAAO,UAAU,EAAE,CAAC,WAAW,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAE,UAAU,CAAC,WAAW,CAAY,CAAC,CAAC,CAAC,IAAI,CAAC;QAC5G,OAAO,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;IACtD,CAAC,CAAC,CAAC;AACL,CAAC;AAED,8DAA8D;AAC9D,MAAM,UAAU,uBAAuB,CAAC,EAAU,EAAE,MAA+B;IACjF,MAAM,KAAK,GAAG,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;IAC7C,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IACpC,OAAO,iBAAiB,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;AACtC,CAAC;AAED,2DAA2D;AAE3D;;;;;;;;GAQG;AACH,MAAM,UAAU,iCAAiC,CAAC,OAAgC;IAChF,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAC7B,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAC7B,MAAM,MAAM,GAAG,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC;IACtE,IAAI,MAAM,KAAK,IAAI;QAAE,OAAO,EAAE,CAAC;IAC/B,IAAI,IAAI,KAAK,kBAAkB,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;QACnD,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;QAC/B,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,EAAE,CAAC;QAC/D,MAAM,QAAQ,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC;QAC5C,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxB,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,CACrC,oBAAoB,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,IAAI,KAAK,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC;QAChF,CAAC;QACD,IAAI,kBAAkB,CAAC,KAAK,CAAC;YAAE,OAAO,EAAE,CAAC;QACzC,OAAO,CAAC,oBAAoB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC;IAC/C,CAAC;IACD,IAAI,IAAI,KAAK,eAAe,IAAI,IAAI,KAAK,cAAc,EAAE,CAAC;QACxD,MAAM,IAAI,GAAG,eAAe,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC;QACnD,MAAM,GAAG,GAAG,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC;QAC1B,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,EAAE,CAAC;QAC3D,OAAO,CAAC,oBAAoB,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;IAC7C,CAAC;IACD,IAAI,IAAI,KAAK,eAAe,IAAI,IAAI,KAAK,aAAa,EAAE,CAAC;QACvD,MAAM,IAAI,GAAG,eAAe,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC;QACnD,MAAM,KAAK,GAAG,cAAc,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;QAC7C,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,EAAE,CAAC;QAClC,OAAO,CAAC,iBAAiB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC;IAC5C,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,2BAA2B,CAAC,OAAgC;IAC1E,IAAI,OAAO,CAAC,SAAS,CAAC,KAAK,IAAI;QAAE,OAAO,EAAE,CAAC;IAC3C,MAAM,MAAM,GAAG,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;IAC/C,MAAM,aAAa,GAAG,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;IACnD,IAAI,MAAM,KAAK,IAAI,IAAI,aAAa,KAAK,IAAI;QAAE,OAAO,EAAE,CAAC;IACzD,MAAM,OAAO,GAAsB,EAAE,CAAC;IACtC,KAAK,MAAM,CAAC,UAAU,EAAE,SAAS,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC;QACpE,MAAM,MAAM,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC;QACnC,IAAI,MAAM,KAAK,IAAI;YAAE,SAAS;QAC9B,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;QAChC,MAAM,IAAI,GAAG,QAAQ,KAAK,KAAK,IAAI,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC;QAC/E,MAAM,IAAI,GACR,OAAO,MAAM,CAAC,cAAc,CAAC,KAAK,QAAQ;YACxC,CAAC,CAAE,MAAM,CAAC,cAAc,CAAY;YACpC,CAAC,CAAC,OAAO,MAAM,CAAC,SAAS,CAAC,KAAK,QAAQ;gBACrC,CAAC,CAAE,MAAM,CAAC,SAAS,CAAY;gBAC/B,CAAC,CAAC,IAAI,CAAC;QACb,MAAM,QAAQ,GAAG,OAAO,MAAM,CAAC,WAAW,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAE,MAAM,CAAC,WAAW,CAAY,CAAC,CAAC,CAAC,IAAI,CAAC;QAClG,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;IAC3D,CAAC;IACD,OAAO,yBAAyB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AACpD,CAAC;AAED,iBAAiB;AAEjB;;;GAGG;AACH,MAAM,UAAU,qBAAqB,CAAC,GAAW;IAC/C,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC;IAC3B,MAAM,KAAK,GAAG,mDAAmD,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAChF,MAAM,KAAK,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC;IACzB,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,OAAO,CAAC;IACxC,OAAO,KAAK,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;AACxC,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,mBAAmB,CAAC,KAAa;IAC/C,+CAA+C;IAC/C,4CAA4C;IAC5C,yBAAyB;IACzB,MAAM,WAAW,GAAG,iCAAiC,CAAC;IACtD,MAAM,aAAa,GAAa,EAAE,CAAC;IACnC,MAAM,UAAU,GAAa,EAAE,CAAC;IAChC,IAAI,IAA4B,CAAC;IACjC,OAAO,CAAC,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;QACjD,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC5B,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IAClD,CAAC;IACD,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,aAAa,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;QACrC,MAAM,GAAG,GAAG,KAAK,GAAG,CAAC,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,GAAG,CAAC,CAAE,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC;QAClF,MAAM,OAAO,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QACxC,MAAM,UAAU,GAAG,sDAAsD,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAC7F,IAAI,UAAU,KAAK,SAAS;YAAE,OAAO;QACrC,IAAI,CAAC;YACH,MAAM,KAAK,GAAY,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YAC9C,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC;gBAAE,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC1E,CAAC;QAAC,MAAM,CAAC;YACP,6BAA6B;QAC/B,CAAC;IACH,CAAC,CAAC,CAAC;IACH,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,yEAAyE;AACzE,MAAM,UAAU,kBAAkB,CAAC,KAAa;IAC9C,OAAO,+BAA+B,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AACrD,CAAC;AAED,qFAAqF;AACrF,SAAS,mBAAmB,CAAC,MAAc;IACzC,IAAI,MAAM,KAAK,YAAY;QAAE,OAAO,aAAa,CAAC;IAClD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,cAAc,CAAC,KAAc;IACpC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IACrC,OAAO,KAAK,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;QAC7B,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;QAC/B,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,MAAM,CAAC,CAAC;QAC9B,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,EAAE,CAAC;QAC7D,MAAM,MAAM,GAAG,OAAO,MAAM,EAAE,CAAC,QAAQ,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAE,MAAM,CAAC,QAAQ,CAAY,CAAC,CAAC,CAAC,SAAS,CAAC;QACjG,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;AACL,CAAC;AAED,sDAAsD;AACtD,SAAS,gBAAgB,CAAC,IAAY;IACpC,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,IAAI,OAAO,GAAG,CAAC,CAAC;IAChB,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QACpC,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;YAAE,SAAS;QACpC,6DAA6D;QAC7D,kCAAkC;QAClC,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;YAAE,SAAS;QACpC,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YACzB,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YAC7B,KAAK,IAAI,CAAC,CAAC;QACb,CAAC;aAAM,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YAChC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YAC7B,OAAO,IAAI,CAAC,CAAC;QACf,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YACzD,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACpB,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtB,CAAC;IACH,CAAC;IACD,mCAAmC;IACnC,OAAO,QAAQ,CAAC,MAAM,GAAG,CAAC,IAAI,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,EAAE;QAAE,QAAQ,CAAC,GAAG,EAAE,CAAC;IACnF,OAAO,QAAQ,CAAC,MAAM,GAAG,CAAC,IAAI,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,EAAE;QAAE,QAAQ,CAAC,GAAG,EAAE,CAAC;IACnF,OAAO;QACL,OAAO,EAAE,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI;QACzD,OAAO,EAAE,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI;QACzD,KAAK;QACL,OAAO;KACR,CAAC;AACJ,CAAC;AAED,SAAS,UAAU,CAAC,IAAmB;IACrC,IAAI,IAAI,KAAK,IAAI,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,CAAC,CAAC;IACjD,MAAM,eAAe,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACvE,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,CAAC,CAAC;IAC3C,OAAO,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC;AAC5C,CAAC;AAED,SAAS,aAAa,CAAC,OAAe;IACpC,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAC/B,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,MAAM,CAAC;IACxC,OAAO,OAAO,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC;AACtE,CAAC;AAED,SAAS,GAAG,CAAC,IAAmB,EAAE,KAAa;IAC7C,IAAI,IAAI,KAAK,IAAI;QAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;IAC5D,IAAI,IAAI,CAAC,MAAM,IAAI,KAAK;QAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;IACnE,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;AAC1D,CAAC;AAED,SAAS,eAAe,CAAC,KAAc;IACrC,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC;IACtD,IAAI,CAAC;QACH,OAAO,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;IACrC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,SAAS,WAAW,CAAC,GAAG,MAAiB;IACvC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC;YAAE,OAAO,KAAK,CAAC;IAClE,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,QAAQ,CAAC,KAAc;IAC9B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QACzE,CAAC,CAAE,KAAiC;QACpC,CAAC,CAAC,IAAI,CAAC;AACX,CAAC"}

package/dist/{codexUsage.d.ts → codex/codexUsage.d.ts}

@@ -1,4 +1,4 @@
-import { type UsageTotals } from "./usageAggregator.js";
+import { type UsageTotals } from "../services/usageAggregator.js";
 /** token_count から読める使用量 + レート制限（plan 相当）。 */
 export interface CodexUsage extends UsageTotals {
     /** モデルのコンテキスト窓（token）。未取得は undefined。 */

package/dist/{codexUsage.js → codex/codexUsage.js}

@@ -11,9 +11,11 @@
 //   - cacheReadTokens    = total_token_usage.cached_input_tokens
 //   - cacheCreationTokens= 0（codex は区別を持たない）
 //   - turns              = 0（codex は assistant ターン数を token_count に持たない）
-//   - fiveHour*(5h窓=primary) / sevenDay*(週窓=secondary) の used_percent(0–100)・resets_at(Unix秒)
+//   - fiveHour* / sevenDay* = rate limit の window_minutes で短期/週次を分類
+//     （primary/secondary の位置は固定ではない）
 import * as fs from "node:fs";
-import { emptyUsageTotals } from "./usageAggregator.js";
+import { emptyUsageTotals } from "../services/usageAggregator.js";
+import { parseCodexAccountUsage } from "./codexAccountUsage.js";
 /** 末尾から読むバイト数上限（直近の token_count は末尾付近にある）。 */
 const TAIL_READ_BYTES = 512 * 1024;
 /**
@@ -54,33 +56,24 @@ export function aggregateCodexUsage(rolloutPath) {
     }
     const rate = p["rate_limits"];
     if (typeof rate === "object" && rate !== null) {
-        const r = rate;
-        applyWindow(r["primary"], (util, resets) => {
-            if (util !== undefined)
-                result.fiveHourUtilization = util;
-            if (resets !== undefined)
-                result.fiveHourResetsAt = resets;
-        });
-        applyWindow(r["secondary"], (util, resets) => {
-            if (util !== undefined)
-                result.sevenDayUtilization = util;
-            if (resets !== undefined)
-                result.sevenDayResetsAt = resets;
-        });
+        // rollout と App Server の rate limit は同じ分類器を通す。primary が週次だけを
+        // 持つプランもあるため、位置固定で primary=5時間 と解釈してはいけない。
+        const accountUsage = parseCodexAccountUsage(rate);
+        if (accountUsage?.fiveHourPercent !== undefined) {
+            result.fiveHourUtilization = accountUsage.fiveHourPercent;
+        }
+        if (accountUsage?.fiveHourResetsAt !== undefined) {
+            result.fiveHourResetsAt = accountUsage.fiveHourResetsAt;
+        }
+        if (accountUsage?.weeklyPercent !== undefined) {
+            result.sevenDayUtilization = accountUsage.weeklyPercent;
+        }
+        if (accountUsage?.weeklyResetsAt !== undefined) {
+            result.sevenDayResetsAt = accountUsage.weeklyResetsAt;
+        }
     }
     return result;
 }
-/** rate_limits の 1 窓（primary/secondary）から used_percent(丸め) と resets_at(ISO) を取り出す。 */
-function applyWindow(raw, set) {
-    if (typeof raw !== "object" || raw === null)
-        return;
-    const w = raw;
-    const used = w["used_percent"];
-    const resets = w["resets_at"];
-    set(typeof used === "number" ? Math.round(used) : undefined, 
-    // resets_at は Unix 秒。usage_response は ISO 文字列で運ぶため変換する。
-    typeof resets === "number" ? new Date(Math.floor(resets) * 1000).toISOString() : undefined);
-}
 /** ファイル末尾チャンクを読み、最後の `type=="event_msg"` かつ `payload.type=="token_count"` 行を返す。 */
 function readLastTokenCountLine(rolloutPath) {
     let fd;

package/dist/codex/codexUsage.js.map

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