codebuff 1.0.282 → 1.0.283

package/dist/common/constants/analytics-events.d.ts

@@ -12,7 +12,8 @@ export declare enum AnalyticsEvent {
     LOGIN = "cli.login",
     TERMINAL_COMMAND_COMPLETED = "cli.terminal_command_completed",
     MALFORMED_PROMPT_RESPONSE = "cli.malformed_prompt_response",
-    PROMPT_SENT = "backend.prompt_sent",
+    USER_INPUT = "backend.user_input",
+    AGENT_STEP = "backend.agent_step",
     CREDIT_GRANT = "backend.credit_grant",
     CREDIT_CONSUMED = "backend.credit_consumed",
     TOOL_USE = "backend.tool_use",

package/dist/common/constants/analytics-events.js

@@ -18,7 +18,8 @@ var AnalyticsEvent;
     AnalyticsEvent["TERMINAL_COMMAND_COMPLETED"] = "cli.terminal_command_completed";
     AnalyticsEvent["MALFORMED_PROMPT_RESPONSE"] = "cli.malformed_prompt_response";
     // Backend
-    AnalyticsEvent["PROMPT_SENT"] = "backend.prompt_sent";
+    AnalyticsEvent["USER_INPUT"] = "backend.user_input";
+    AnalyticsEvent["AGENT_STEP"] = "backend.agent_step";
     AnalyticsEvent["CREDIT_GRANT"] = "backend.credit_grant";
     AnalyticsEvent["CREDIT_CONSUMED"] = "backend.credit_consumed";
     AnalyticsEvent["TOOL_USE"] = "backend.tool_use";

package/dist/common/constants/analytics-events.js.map

@@ -1 +1 @@
-{"version":3,"file":"analytics-events.js","sourceRoot":"","sources":["../../src/constants/analytics-events.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH,IAAY,cAqBX;AArBD,WAAY,cAAc;IACxB,MAAM;IACN,mDAAiC,CAAA;IACjC,iFAA+D,CAAA;IAC/D,uEAAqD,CAAA;IACrD,mGAAiF,CAAA;IACjF,2EAAyD,CAAA;IACzD,2DAAyC,CAAA;IACzC,yEAAuD,CAAA;IACvD,qCAAmB,CAAA;IACnB,+EAA6D,CAAA;IAC7D,6EAA2D,CAAA;IAE3D,UAAU;IACV,qDAAmC,CAAA;IACnC,uDAAqC,CAAA;IACrC,6DAA2C,CAAA;IAC3C,+CAA6B,CAAA;IAE7B,MAAM;IACN,uCAAqB,CAAA;AACvB,CAAC,EArBW,cAAc,8BAAd,cAAc,QAqBzB"}
+{"version":3,"file":"analytics-events.js","sourceRoot":"","sources":["../../src/constants/analytics-events.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH,IAAY,cAsBX;AAtBD,WAAY,cAAc;IACxB,MAAM;IACN,mDAAiC,CAAA;IACjC,iFAA+D,CAAA;IAC/D,uEAAqD,CAAA;IACrD,mGAAiF,CAAA;IACjF,2EAAyD,CAAA;IACzD,2DAAyC,CAAA;IACzC,yEAAuD,CAAA;IACvD,qCAAmB,CAAA;IACnB,+EAA6D,CAAA;IAC7D,6EAA2D,CAAA;IAE3D,UAAU;IACV,mDAAiC,CAAA;IACjC,mDAAiC,CAAA;IACjC,uDAAqC,CAAA;IACrC,6DAA2C,CAAA;IAC3C,+CAA6B,CAAA;IAE7B,MAAM;IACN,uCAAqB,CAAA;AACvB,CAAC,EAtBW,cAAc,8BAAd,cAAc,QAsBzB"}

package/dist/common/constants/tools.d.ts

@@ -10,6 +10,7 @@ export declare const toolSchema: {
     think_deeply: string[];
     create_plan: string[];
     browser_logs: string[];
+    end_turn: never[];
 };
 export type ToolName = keyof typeof toolSchema;
 export declare const TOOL_LIST: ToolName[];

package/dist/common/constants/tools.js

@@ -17,6 +17,7 @@ exports.toolSchema = {
     think_deeply: ['thought'],
     create_plan: ['path', 'plan'],
     browser_logs: ['type', 'url', 'waitUntil'],
+    end_turn: [],
 };
 // List of all available tools
 exports.TOOL_LIST = Object.keys(exports.toolSchema);

package/dist/common/constants/tools.js.map

@@ -1 +1 @@
-{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../src/constants/tools.ts"],"names":[],"mappings":";;;AAAa,QAAA,UAAU,GAAG;IACxB,yCAAyC;IACzC,WAAW,EAAE,CAAC,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,CAAC;IACzD,cAAc,EAAE,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,CAAC;IAE/C,kBAAkB;IAClB,UAAU,EAAE,CAAC,MAAM,EAAE,SAAS,CAAC;IAC/B,WAAW,EAAE,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC;IACnC,UAAU,EAAE,CAAC,OAAO,CAAC;IACrB,UAAU,EAAE,CAAC,aAAa,CAAC;IAE3B,sBAAsB;IACtB,WAAW,EAAE,CAAC,SAAS,CAAC;IACxB,oBAAoB,EAAE,CAAC,SAAS,EAAE,cAAc,EAAE,KAAK,EAAE,iBAAiB,CAAC;IAE3E,iBAAiB;IACjB,YAAY,EAAE,CAAC,SAAS,CAAC;IACzB,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC;IAE7B,YAAY,EAAE,CAAC,MAAM,EAAE,KAAK,EAAE,WAAW,CAAC;CAC3C,CAAA;AAID,8BAA8B;AACjB,QAAA,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,kBAAU,CAAe,CAAA;AAEvD,MAAM,iBAAiB,GAAG,CAC/B,QAAkB,EAClB,MAA8B,EAC9B,EAAE;IACF,MAAM,OAAO,GAAG,IAAI,QAAQ,GAAG,CAAA;IAC/B,MAAM,QAAQ,GAAG,KAAK,QAAQ,GAAG,CAAA;IAEjC,0CAA0C;IAC1C,MAAM,UAAU,GAAG,kBAAU,CAAC,QAAQ,CAAa,CAAA;IAEnD,4DAA4D;IAC5D,MAAM,aAAa,GAAG,UAAU;SAC7B,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,IAAI,MAAM,CAAC,CAAC,iDAAiD;SACpF,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC,KAAK,KAAK,GAAG,CAAC,CAAA;IAE1D,wDAAwD;IACxD,MAAM,gBAAgB,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;SAC5C,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;SAChD,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,IAAI,KAAK,IAAI,KAAK,KAAK,KAAK,GAAG,CAAC,CAAA;IAE3D,4CAA4C;IAC5C,MAAM,YAAY,GAAG,CAAC,GAAG,aAAa,EAAE,GAAG,gBAAgB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAEvE,OAAO,YAAY;QACjB,CAAC,CAAC,GAAG,OAAO,KAAK,YAAY,KAAK,QAAQ,EAAE;QAC5C,CAAC,CAAC,GAAG,OAAO,GAAG,QAAQ,EAAE,CAAA;AAC7B,CAAC,CAAA;AA1BY,QAAA,iBAAiB,qBA0B7B"}
+{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../src/constants/tools.ts"],"names":[],"mappings":";;;AAAa,QAAA,UAAU,GAAG;IACxB,yCAAyC;IACzC,WAAW,EAAE,CAAC,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,CAAC;IACzD,cAAc,EAAE,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,CAAC;IAE/C,kBAAkB;IAClB,UAAU,EAAE,CAAC,MAAM,EAAE,SAAS,CAAC;IAC/B,WAAW,EAAE,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC;IACnC,UAAU,EAAE,CAAC,OAAO,CAAC;IACrB,UAAU,EAAE,CAAC,aAAa,CAAC;IAE3B,sBAAsB;IACtB,WAAW,EAAE,CAAC,SAAS,CAAC;IACxB,oBAAoB,EAAE,CAAC,SAAS,EAAE,cAAc,EAAE,KAAK,EAAE,iBAAiB,CAAC;IAE3E,iBAAiB;IACjB,YAAY,EAAE,CAAC,SAAS,CAAC;IACzB,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC;IAE7B,YAAY,EAAE,CAAC,MAAM,EAAE,KAAK,EAAE,WAAW,CAAC;IAE1C,QAAQ,EAAE,EAAE;CACb,CAAA;AAID,8BAA8B;AACjB,QAAA,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,kBAAU,CAAe,CAAA;AAEvD,MAAM,iBAAiB,GAAG,CAC/B,QAAkB,EAClB,MAA8B,EAC9B,EAAE;IACF,MAAM,OAAO,GAAG,IAAI,QAAQ,GAAG,CAAA;IAC/B,MAAM,QAAQ,GAAG,KAAK,QAAQ,GAAG,CAAA;IAEjC,0CAA0C;IAC1C,MAAM,UAAU,GAAG,kBAAU,CAAC,QAAQ,CAAa,CAAA;IAEnD,4DAA4D;IAC5D,MAAM,aAAa,GAAG,UAAU;SAC7B,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,IAAI,MAAM,CAAC,CAAC,iDAAiD;SACpF,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC,KAAK,KAAK,GAAG,CAAC,CAAA;IAE1D,wDAAwD;IACxD,MAAM,gBAAgB,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;SAC5C,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;SAChD,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,IAAI,KAAK,IAAI,KAAK,KAAK,KAAK,GAAG,CAAC,CAAA;IAE3D,4CAA4C;IAC5C,MAAM,YAAY,GAAG,CAAC,GAAG,aAAa,EAAE,GAAG,gBAAgB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAEvE,OAAO,YAAY;QACjB,CAAC,CAAC,GAAG,OAAO,KAAK,YAAY,KAAK,QAAQ,EAAE;QAC5C,CAAC,CAAC,GAAG,OAAO,GAAG,QAAQ,EAAE,CAAA;AAC7B,CAAC,CAAA;AA1BY,QAAA,iBAAiB,qBA0B7B"}

package/dist/common/db/schema.d.ts

@@ -1,6 +1,6 @@
 export declare const ReferralStatus: import("drizzle-orm/pg-core").PgEnum<[import("../types/referral").ReferralStatus, ...import("../types/referral").ReferralStatus[]]>;
 export declare const apiKeyTypeEnum: import("drizzle-orm/pg-core").PgEnum<["anthropic", "gemini", "openai"]>;
-export declare const grantTypeEnum: import("drizzle-orm/pg-core").PgEnum<[import("../types/grant").GrantType, ...import("../types/grant").GrantType[]]>;
+export declare const grantTypeEnum: import("drizzle-orm/pg-core").PgEnum<["free", ...("free" | "referral" | "purchase" | "admin")[]]>;
 export type GrantType = (typeof grantTypeEnum.enumValues)[number];
 export declare const user: import("drizzle-orm/pg-core").PgTableWithColumns<{
     name: "user";
@@ -569,14 +569,14 @@ export declare const creditLedger: import("drizzle-orm/pg-core").PgTableWithColu
             tableName: "credit_ledger";
             dataType: "string";
             columnType: "PgEnumColumn";
-            data: import("../types/grant").GrantType;
+            data: "free" | "referral" | "purchase" | "admin";
             driverParam: string;
             notNull: true;
             hasDefault: false;
             isPrimaryKey: false;
             isAutoincrement: false;
             hasRuntimeDefault: false;
-            enumValues: [import("../types/grant").GrantType, ...import("../types/grant").GrantType[]];
+            enumValues: ["free", ...("free" | "referral" | "purchase" | "admin")[]];
             baseColumn: never;
             identity: undefined;
             generated: undefined;
@@ -1385,7 +1385,7 @@ export declare const encryptedApiKeys: import("drizzle-orm/pg-core").PgTableWith
             tableName: "encrypted_api_keys";
             dataType: "string";
             columnType: "PgEnumColumn";
-            data: "gemini" | "anthropic" | "openai";
+            data: "anthropic" | "gemini" | "openai";
             driverParam: string;
             notNull: true;
             hasDefault: false;

package/dist/common/types/grant.d.ts

@@ -1,2 +1,2 @@
 export type GrantType = 'free' | 'referral' | 'purchase' | 'admin';
-export declare const GrantTypeValues: GrantType[];
+export declare const GrantTypeValues: readonly ["free", "referral", "purchase", "admin"];

package/dist/common/types/grant.js.map

@@ -1 +1 @@
-{"version":3,"file":"grant.js","sourceRoot":"","sources":["../../src/types/grant.ts"],"names":[],"mappings":";;;AAEa,QAAA,eAAe,GAAgB;IAC1C,MAAM;IACN,UAAU;IACV,UAAU;IACV,OAAO;CACR,CAAA"}
+{"version":3,"file":"grant.js","sourceRoot":"","sources":["../../src/types/grant.ts"],"names":[],"mappings":";;;AAEa,QAAA,eAAe,GAAG;IAC7B,MAAM;IACN,UAAU;IACV,UAAU;IACV,OAAO;CACC,CAAC"}

package/dist/common/types/usage.d.ts

@@ -5,36 +5,36 @@ export declare const usageDataSchema: z.ZodObject<{
         totalRemaining: z.ZodNumber;
         totalDebt: z.ZodNumber;
         netBalance: z.ZodNumber;
-        breakdown: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodNumber>>;
+        breakdown: z.ZodRecord<z.ZodEnum<["free", "referral", "purchase", "admin"]>, z.ZodNumber>;
     }, "strip", z.ZodTypeAny, {
         totalRemaining: number;
         totalDebt: number;
         netBalance: number;
-        breakdown?: Record<string, number> | undefined;
+        breakdown: Partial<Record<"free" | "referral" | "purchase" | "admin", number>>;
     }, {
         totalRemaining: number;
         totalDebt: number;
         netBalance: number;
-        breakdown?: Record<string, number> | undefined;
+        breakdown: Partial<Record<"free" | "referral" | "purchase" | "admin", number>>;
     }>;
     nextQuotaReset: z.ZodNullable<z.ZodDate>;
 }, "strip", z.ZodTypeAny, {
+    usageThisCycle: number;
     balance: {
         totalRemaining: number;
         totalDebt: number;
         netBalance: number;
-        breakdown?: Record<string, number> | undefined;
+        breakdown: Partial<Record<"free" | "referral" | "purchase" | "admin", number>>;
     };
-    usageThisCycle: number;
     nextQuotaReset: Date | null;
 }, {
+    usageThisCycle: number;
     balance: {
         totalRemaining: number;
         totalDebt: number;
         netBalance: number;
-        breakdown?: Record<string, number> | undefined;
+        breakdown: Partial<Record<"free" | "referral" | "purchase" | "admin", number>>;
     };
-    usageThisCycle: number;
     nextQuotaReset: Date | null;
 }>;
 export type UsageData = z.infer<typeof usageDataSchema>;

package/dist/common/types/usage.js

@@ -2,13 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.usageDataSchema = void 0;
 const zod_1 = require("zod");
+const grant_1 = require("./grant");
 exports.usageDataSchema = zod_1.z.object({
     usageThisCycle: zod_1.z.number(),
     balance: zod_1.z.object({
         totalRemaining: zod_1.z.number(),
         totalDebt: zod_1.z.number(),
         netBalance: zod_1.z.number(),
-        breakdown: zod_1.z.record(zod_1.z.string(), zod_1.z.number()).optional(),
+        breakdown: zod_1.z.record(zod_1.z.enum(grant_1.GrantTypeValues), zod_1.z.number()),
     }),
     nextQuotaReset: zod_1.z.coerce.date().nullable(),
 });

package/dist/common/types/usage.js.map

@@ -1 +1 @@
-{"version":3,"file":"usage.js","sourceRoot":"","sources":["../../src/types/usage.ts"],"names":[],"mappings":";;;AAAA,6BAAuB;AAGV,QAAA,eAAe,GAAG,OAAC,CAAC,MAAM,CAAC;IACtC,cAAc,EAAE,OAAC,CAAC,MAAM,EAAE;IAC1B,OAAO,EAAE,OAAC,CAAC,MAAM,CAAC;QAChB,cAAc,EAAE,OAAC,CAAC,MAAM,EAAE;QAC1B,SAAS,EAAE,OAAC,CAAC,MAAM,EAAE;QACrB,UAAU,EAAE,OAAC,CAAC,MAAM,EAAE;QACtB,SAAS,EAAE,OAAC,CAAC,MAAM,CAAC,OAAC,CAAC,MAAM,EAAE,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE;KACvD,CAAC;IACF,cAAc,EAAE,OAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE;CAC3C,CAAC,CAAA"}
+{"version":3,"file":"usage.js","sourceRoot":"","sources":["../../src/types/usage.ts"],"names":[],"mappings":";;;AAAA,6BAAuB;AACvB,mCAAyC;AAE5B,QAAA,eAAe,GAAG,OAAC,CAAC,MAAM,CAAC;IACtC,cAAc,EAAE,OAAC,CAAC,MAAM,EAAE;IAC1B,OAAO,EAAE,OAAC,CAAC,MAAM,CAAC;QAChB,cAAc,EAAE,OAAC,CAAC,MAAM,EAAE;QAC1B,SAAS,EAAE,OAAC,CAAC,MAAM,EAAE;QACrB,UAAU,EAAE,OAAC,CAAC,MAAM,EAAE;QACtB,SAAS,EAAE,OAAC,CAAC,MAAM,CAAC,OAAC,CAAC,IAAI,CAAC,uBAAe,CAAC,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC;KACzD,CAAC;IACF,cAAc,EAAE,OAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE;CAC3C,CAAC,CAAA"}

package/dist/common/util/__tests__/saxy.test.js

@@ -67,32 +67,42 @@ const saxy_1 = require("../saxy");
             const events = processXML(xml, schema);
             (0, bun_test_1.expect)(events).toEqual([
                 {
-                    type: 'tagopen',
                     data: {
                         attrs: '',
                         isSelfClosing: false,
                         name: 'root',
+                        rawTag: '<root>',
                     },
+                    type: 'tagopen',
                 },
                 {
-                    type: 'tagopen',
                     data: {
                         attrs: '',
                         isSelfClosing: false,
                         name: 'child',
+                        rawTag: '<child>',
                     },
+                    type: 'tagopen',
                 },
                 {
+                    data: {
+                        contents: 'content',
+                    },
                     type: 'text',
-                    data: { contents: 'content' },
                 },
                 {
+                    data: {
+                        name: 'child',
+                        rawTag: '</child>',
+                    },
                     type: 'tagclose',
-                    data: { name: 'child' },
                 },
                 {
+                    data: {
+                        name: 'root',
+                        rawTag: '</root>',
+                    },
                     type: 'tagclose',
-                    data: { name: 'root' },
                 },
             ]);
         });
@@ -182,23 +192,27 @@ const saxy_1 = require("../saxy");
         parser.end();
         (0, bun_test_1.expect)(events).toEqual([
             {
-                type: 'text',
                 data: {
                     contents: 'This is < not a tag> and < another not a tag> but ',
                 },
+                type: 'text',
             },
             {
+                data: {
+                    attrs: '',
+                    isSelfClosing: false,
+                    name: 'valid',
+                    rawTag: '<valid>',
+                },
                 type: 'tagopen',
-                data: { name: 'valid', isSelfClosing: false, attrs: '' },
             },
             {
+                data: {
+                    contents: 'this is',
+                },
                 type: 'text',
-                data: { contents: 'this is' },
-            },
-            {
-                type: 'tagclose',
-                data: { name: 'valid' },
             },
+            { data: { name: 'valid', rawTag: '</valid>' }, type: 'tagclose' },
         ]);
     });
     (0, bun_test_1.it)('should handle text with angle brackets but no valid tag names', () => {
@@ -224,24 +238,38 @@ const saxy_1 = require("../saxy");
         parser.end();
         (0, bun_test_1.expect)(events).toEqual([
             {
+                data: {
+                    contents: 'Text with < brackets> and ',
+                },
                 type: 'text',
-                data: { contents: 'Text with < brackets> and ' },
             },
             {
+                data: {
+                    attrs: '',
+                    isSelfClosing: false,
+                    name: 'valid-tag',
+                    rawTag: '<valid-tag>',
+                },
                 type: 'tagopen',
-                data: { name: 'valid-tag', isSelfClosing: false, attrs: '' },
             },
             {
+                data: {
+                    contents: 'real XML',
+                },
                 type: 'text',
-                data: { contents: 'real XML' },
             },
             {
+                data: {
+                    name: 'valid-tag',
+                    rawTag: '</valid-tag>',
+                },
                 type: 'tagclose',
-                data: { name: 'valid-tag' },
             },
             {
+                data: {
+                    contents: ' mixed together',
+                },
                 type: 'text',
-                data: { contents: ' mixed together' },
             },
         ]);
     });
@@ -285,7 +313,7 @@ const saxy_1 = require("../saxy");
                 },
             ]);
         });
-        (0, bun_test_1.it)('should handle split HTML entities in text content', () => {
+        (0, bun_test_1.it)('should handle split XML entities in text content', () => {
             // Re-initialize parser and events array inside the test
             const parser = new saxy_1.Saxy();
             const events = [];
@@ -296,11 +324,36 @@ const saxy_1 = require("../saxy");
             parser.write('t; entities &g');
             parser.end();
             (0, bun_test_1.expect)(events).toEqual([
-                { type: 'text', data: { contents: 'Text with ' } },
-                { type: 'text', data: { contents: '& and' } },
-                { type: 'text', data: { contents: ' ' } },
-                { type: 'text', data: { contents: '< entities ' } },
-                { type: 'text', data: { contents: '&g' } },
+                {
+                    data: {
+                        contents: 'Text with ',
+                    },
+                    type: 'text',
+                },
+                {
+                    data: {
+                        contents: '& and',
+                    },
+                    type: 'text',
+                },
+                {
+                    data: {
+                        contents: ' ',
+                    },
+                    type: 'text',
+                },
+                {
+                    data: {
+                        contents: '< entities ',
+                    },
+                    type: 'text',
+                },
+                {
+                    data: {
+                        contents: '&g',
+                    },
+                    type: 'text',
+                },
             ]);
             (0, bun_test_1.expect)(events.map((chunk) => chunk.data.contents).join('')).toEqual('Text with & and < entities &g');
         });
@@ -310,36 +363,58 @@ const saxy_1 = require("../saxy");
             parser.on('text', (data) => events.push({ type: 'text', data }));
             parser.on('tagopen', (data) => events.push({ type: 'tagopen', data }));
             parser.on('tagclose', (data) => events.push({ type: 'tagclose', data }));
-            parser.write('<root>  <child>  text  </child>  </root>');
+            parser.write('<root> text <child>  text  </child> text </root>');
             parser.end();
             (0, bun_test_1.expect)(events).toEqual([
                 {
+                    data: {
+                        attrs: '',
+                        isSelfClosing: false,
+                        name: 'root',
+                        rawTag: '<root>',
+                    },
                     type: 'tagopen',
-                    data: { name: 'root', isSelfClosing: false, attrs: '' },
                 },
                 {
+                    data: {
+                        contents: ' text ',
+                    },
                     type: 'text',
-                    data: { contents: '  ' },
                 },
                 {
+                    data: {
+                        attrs: '',
+                        isSelfClosing: false,
+                        name: 'child',
+                        rawTag: '<child>',
+                    },
                     type: 'tagopen',
-                    data: { name: 'child', isSelfClosing: false, attrs: '' },
                 },
                 {
+                    data: {
+                        contents: '  text  ',
+                    },
                     type: 'text',
-                    data: { contents: '  text  ' },
                 },
                 {
+                    data: {
+                        name: 'child',
+                        rawTag: '</child>',
+                    },
                     type: 'tagclose',
-                    data: { name: 'child' },
                 },
                 {
+                    data: {
+                        contents: ' text ',
+                    },
                     type: 'text',
-                    data: { contents: '  ' },
                 },
                 {
+                    data: {
+                        name: 'root',
+                        rawTag: '</root>',
+                    },
                     type: 'tagclose',
-                    data: { name: 'root' },
                 },
             ]);
         });
@@ -383,12 +458,33 @@ const saxy_1 = require("../saxy");
             // reconstruct the original text correctly
             (0, bun_test_1.expect)(events).toEqual([
                 {
+                    data: {
+                        attrs: '',
+                        isSelfClosing: false,
+                        name: 'tag',
+                        rawTag: '<tag>',
+                    },
                     type: 'tagopen',
-                    data: { name: 'tag', isSelfClosing: false, attrs: '' },
                 },
-                { type: 'text', data: { contents: 'before ' } },
-                { type: 'text', data: { contents: '& after' } },
-                { type: 'tagclose', data: { name: 'tag' } },
+                {
+                    data: {
+                        contents: 'before ',
+                    },
+                    type: 'text',
+                },
+                {
+                    data: {
+                        contents: '& after',
+                    },
+                    type: 'text',
+                },
+                {
+                    data: {
+                        name: 'tag',
+                        rawTag: '</tag>',
+                    },
+                    type: 'tagclose',
+                },
             ]);
             // The text content should be properly reconstructed
             const textContent = events
@@ -424,17 +520,32 @@ const saxy_1 = require("../saxy");
             // The & should be treated as literal text and stay with its surrounding content
             (0, bun_test_1.expect)(events).toEqual([
                 {
+                    data: {
+                        attrs: '',
+                        isSelfClosing: false,
+                        name: 'tag',
+                        rawTag: '<tag>',
+                    },
                     type: 'tagopen',
-                    data: { name: 'tag', isSelfClosing: false, attrs: '' },
                 },
                 {
+                    data: {
+                        contents: 'before ',
+                    },
                     type: 'text',
-                    data: { contents: 'before ' },
                 },
-                { type: 'text', data: { contents: '& after' } },
                 {
+                    data: {
+                        contents: '& after',
+                    },
+                    type: 'text',
+                },
+                {
+                    data: {
+                        name: 'tag',
+                        rawTag: '</tag>',
+                    },
                     type: 'tagclose',
-                    data: { name: 'tag' },
                 },
             ]);
             // The text content should be properly reconstructed
@@ -478,20 +589,32 @@ const saxy_1 = require("../saxy");
             // The text content should be emitted in two chunks due to the new immediate emission behavior
             (0, bun_test_1.expect)(events).toEqual([
                 {
+                    data: {
+                        attrs: '',
+                        isSelfClosing: false,
+                        name: 'tag',
+                        rawTag: '<tag>',
+                    },
                     type: 'tagopen',
-                    data: { name: 'tag', isSelfClosing: false, attrs: '' },
                 },
                 {
+                    data: {
+                        contents: 'Some text',
+                    },
                     type: 'text',
-                    data: { contents: 'Some text' },
                 },
                 {
+                    data: {
+                        contents: ' continued',
+                    },
                     type: 'text',
-                    data: { contents: ' continued' },
                 },
                 {
+                    data: {
+                        name: 'tag',
+                        rawTag: '</tag>',
+                    },
                     type: 'tagclose',
-                    data: { name: 'tag' },
                 },
             ]);
             // The text content should still be properly reconstructible
@@ -513,16 +636,27 @@ const saxy_1 = require("../saxy");
             // The text content should be emitted in two chunks due to the new immediate emission behavior
             (0, bun_test_1.expect)(events).toEqual([
                 {
+                    data: {
+                        attrs: '',
+                        isSelfClosing: false,
+                        name: 'tag',
+                        rawTag: '<tag>',
+                    },
                     type: 'tagopen',
-                    data: { name: 'tag', isSelfClosing: false, attrs: '' },
                 },
                 {
-                    type: 'text',
-                    data: { contents: '</invalid>' },
+                    data: {
+                        name: 'invalid',
+                        rawTag: '</invalid>',
+                    },
+                    type: 'tagclose',
                 },
                 {
+                    data: {
+                        name: 'tag',
+                        rawTag: '</tag>',
+                    },
                     type: 'tagclose',
-                    data: { name: 'tag' },
                 },
             ]);
             // The text content should still be properly reconstructible
@@ -530,7 +664,7 @@ const saxy_1 = require("../saxy");
                 .filter((e) => e.type === 'text')
                 .map((e) => e.data.contents)
                 .join('');
-            (0, bun_test_1.expect)(textContent).toBe('</invalid>');
+            (0, bun_test_1.expect)(textContent).toBe('');
         });
     });
 });