@macroforge/mcp-server 0.1.77 → 0.1.79

package/docs/builtin-macros/clone.md

@@ -9,21 +9,24 @@ independent copies of values.
 | Type | Generated Code | Description |
 |------|----------------|-------------|
 | Class | `classNameClone(value)` + `static clone(value)` | Standalone function + static wrapper method |
-| Enum | `enumNameClone(value: EnumName): EnumName` | Standalone function (enums are primitives, returns value as-is) |
-| Interface | `interfaceNameClone(value: InterfaceName): InterfaceName` | Standalone function creating a new object literal |
-| Type Alias | `typeNameClone(value: TypeName): TypeName` | Standalone function with spread copy for objects |
+| Enum | `enumNameClone(value): EnumName` | Standalone function (enums are primitives, returns value as-is) |
+| Interface | `ifaceNameClone(value): InterfaceName` | Standalone function creating a new object literal |
+| Type Alias | `typeNameClone(value): TypeName` | Standalone function with spread copy for objects |
 
+Names use **camelCase** conversion (e.g., `Point` -> `pointClone`).
 
-## Cloning Strategy
 
-The generated clone performs a **shallow copy** of all fields:
+## Cloning Strategy
 
-- **Primitives** (`string`, `number`, `boolean`): Copied by value
-- **Objects**: Reference is copied (not deep cloned)
-- **Arrays**: Reference is copied (not deep cloned)
+The generated clone is **type-aware** when a type registry is available:
 
-For deep cloning of nested objects, those objects should also derive `Clone`
-and the caller should clone them explicitly.
+- **Primitives** (`string`, `number`, `boolean`, `bigint`): Copied by value
+- **`Date`**: Deep cloned via `new Date(x.getTime())`
+- **Arrays**: Spread copy `[...arr]`, or deep map if element type has `Clone`
+- **`Map`/`Set`**: New collection, deep copy if value type has `Clone`
+- **Objects with `@derive(Clone)`**: Deep cloned via their standalone clone function
+- **Optional fields**: Null-checked -- `null`/`undefined` pass through unchanged
+- **Other objects**: Shallow copy (reference)
 
 ## Example
 

package/docs/builtin-macros/debug.md

@@ -11,11 +11,13 @@ method `static toString(value)` returning a string like `"ClassName { field1: va
 **Enums**: Generates a standalone function `enumNameToString(value)` that performs
 reverse lookup on numeric enums.
 
-**Interfaces**: Generates a standalone function `interfaceNameToString(value)`.
+**Interfaces**: Generates a standalone function `ifaceNameToString(value)`.
 
 **Type Aliases**: Generates a standalone function using JSON.stringify for
 complex types, or field enumeration for object types.
 
+Names use **camelCase** conversion (e.g., `User` -> `userToString`).
+
 
 ## Field-Level Options
 

package/docs/builtin-macros/default.md

@@ -8,10 +8,12 @@ a standard way to create "zero" or "empty" instances of types.
 
 | Type | Generated Code | Description |
 |------|----------------|-------------|
-| Class | `static defaultValue(): ClassName` | Static factory method |
-| Enum | `defaultValueEnumName(): EnumName` | Standalone function returning marked variant |
-| Interface | `defaultValueInterfaceName(): InterfaceName` | Standalone function returning object literal |
-| Type Alias | `defaultValueTypeName(): TypeName` | Standalone function with type-appropriate default |
+| Class | `static defaultValue()` + `classNameDefaultValue()` | Static factory method + standalone function |
+| Enum | `enumNameDefaultValue(): EnumName` | Standalone function returning `@default` variant |
+| Interface | `ifaceNameDefaultValue(): InterfaceName` | Standalone function returning object literal |
+| Type Alias | `typeNameDefaultValue(): TypeName` | Standalone function with type-appropriate default |
+
+Names use **camelCase** conversion (e.g., `UserSettings` -> `userSettingsDefaultValue`).
 
 
 ## Default Values by Type
@@ -72,6 +74,10 @@ class UserSettings {
         return instance;
     }
 }
+
+export function userSettingsDefaultValue(): UserSettings {
+    return UserSettings.defaultValue();
+}
 ```
 
 ## Enum Defaults
@@ -99,10 +105,6 @@ enum Status {
 export function statusDefaultValue(): Status {
     return Status.Pending;
 }
-
-namespace Status {
-    export const defaultValue = statusDefaultValue;
-}
 ```
 
 ## Error Handling

package/docs/builtin-macros/deserialize/cycleforward-reference-support.md

@@ -7,5 +7,6 @@ Uses deferred patching to handle references:
 3. After all objects are created, `ctx.applyPatches()` resolves all pending references
 
 References only apply to object-shaped, serializable values. The generator avoids probing for
-`__ref` on primitive-like fields (including literal unions and `T | null` where `T` is primitive-like),
-and it parses `Date` / `Date | null` from ISO strings without treating them as references.
+`__ref` on primitive-like fields (including literal unions and `T | null` where `T` is
+primitive-like), and it parses `Date` / `Date | null` from ISO strings without treating them as
+references.

package/docs/builtin-macros/deserialize/example.md

@@ -53,7 +53,7 @@ class User {
      */
     static deserialize(
         input: unknown,
-        opts?: @{DESERIALIZE_OPTIONS}
+        opts?: @DESERIALIZE_OPTIONS
     ): Result<
         User,
         Array<{
@@ -65,9 +65,9 @@ class User {
             // Auto-detect: if string, parse as JSON first
             const data = typeof input === 'string' ? JSON.parse(input) : input;
 
-            const ctx = @{DESERIALIZE_CONTEXT}.create();
+            const ctx = @DESERIALIZE_CONTEXT.create();
             const resultOrRef = User.deserializeWithContext(data, ctx);
-            if (@{PENDING_REF}.is(resultOrRef)) {
+            if (@PENDING_REF.is(resultOrRef)) {
                 return Result.err([
                     {
                         field: '_root',
@@ -81,7 +81,7 @@ class User {
             }
             return Result.ok(resultOrRef);
         } catch (e) {
-            if (e instanceof @{DESERIALIZE_ERROR}) {
+            if (e instanceof @DESERIALIZE_ERROR) {
                 return Result.err(e.errors);
             }
             const message = e instanceof Error ? e.message : String(e);
@@ -95,12 +95,12 @@ class User {
     }
 
     /** @internal */
-    static deserializeWithContext(value: any, ctx: @{DESERIALIZE_CONTEXT}): User | @{PENDING_REF} {
+    static deserializeWithContext(value: any, ctx: @DESERIALIZE_CONTEXT): User | @PENDING_REF {
         if (value?.__ref !== undefined) {
             return ctx.getOrDefer(value.__ref);
         }
         if (typeof value !== 'object' || value === null || Array.isArray(value)) {
-            throw new @{DESERIALIZE_ERROR}([
+            throw new @DESERIALIZE_ERROR([
                 {
                     field: '_root',
                     message: 'User.deserializeWithContext: expected an object'
@@ -134,7 +134,7 @@ class User {
             });
         }
         if (errors.length > 0) {
-            throw new @{DESERIALIZE_ERROR}(errors);
+            throw new @deserialize_error_expr(errors);
         }
         const instance = Object.create(User.prototype) as User;
         if (obj.__id !== undefined) {
@@ -160,7 +160,7 @@ class User {
             instance.age = __raw_age;
         }
         if (errors.length > 0) {
-            throw new @{DESERIALIZE_ERROR}(errors);
+            throw new @deserialize_error_expr(errors);
         }
         return instance;
     }
@@ -214,4 +214,5 @@ if (Result.isOk(result)) {
 ## Required Imports
 
 The generated code automatically imports:
-- `DeserializeContext`, `DeserializeError`, `PendingRef` from `macroforge/serde`
+
+- `DeserializeContext`, `DeserializeError`, `PendingRef` from `macroforge/serde`

package/docs/builtin-macros/deserialize/overview.md

@@ -1,21 +1,21 @@
 # Deserialize
 
-The `Deserialize` macro generates JSON deserialization methods with **cycle and
-forward-reference support**, plus comprehensive runtime validation. This enables
-safe parsing of complex JSON structures including circular references.
+The `Deserialize` macro generates JSON deserialization methods with **cycle and forward-reference
+support**, plus comprehensive runtime validation. This enables safe parsing of complex JSON
+structures including circular references.
 
 ## Generated Output
 
-| Type | Generated Code | Description |
-|------|----------------|-------------|
-| Class | `classNameDeserialize(input)` + `static deserialize(input)` | Standalone function + static factory method |
-| Enum | `enumNameDeserialize(input)`, `enumNameDeserializeWithContext(data)`, `enumNameIs(value)` | Standalone functions |
-| Interface | `interfaceNameDeserialize(input)`, etc. | Standalone functions |
-| Type Alias | `typeNameDeserialize(input)`, etc. | Standalone functions |
+| Type       | Generated Code                                                                            | Description                                 |
+| ---------- | ----------------------------------------------------------------------------------------- | ------------------------------------------- |
+| Class      | `classNameDeserialize(input)` + `static deserialize(input)`                               | Standalone function + static factory method |
+| Enum       | `enumNameDeserialize(input)`, `enumNameDeserializeWithContext(data)`, `enumNameIs(value)` | Standalone functions                        |
+| Interface  | `interfaceNameDeserialize(input)`, etc.                                                   | Standalone functions                        |
+| Type Alias | `typeNameDeserialize(input)`, etc.                                                        | Standalone functions                        |
 
 ## Return Type
 
 All public deserialization methods return `Result<T, Array<{ field: string; message: string }>>`:
 
 - `Result.ok(value)` - Successfully deserialized value
-- `Result.err(errors)` - Array of validation errors with field names and messages
+- `Result.err(errors)` - Array of validation errors with field names and messages

package/docs/builtin-macros/deserialize/union-type-deserialization.md

@@ -3,25 +3,31 @@
 Union types are deserialized based on their member types:
 
 ### Literal Unions
-For unions of literal values (`"A" | "B" | 123`), the value is validated against
-the allowed literals directly.
+
+For unions of literal values (`"A" | "B" | 123`), the value is validated against the allowed
+literals directly.
 
 ### Primitive Unions
-For unions containing primitive types (`string | number`), the deserializer uses
-`typeof` checks to validate the value type. No `__type` discriminator is needed.
+
+For unions containing primitive types (`string | number`), the deserializer uses `typeof` checks to
+validate the value type. No `__type` discriminator is needed.
 
 ### Class/Interface Unions
-For unions of serializable types (`User | Admin`), the deserializer requires a
-`__type` field in the JSON to dispatch to the correct type's `deserializeWithContext` method.
+
+For unions of serializable types (`User | Admin`), the deserializer requires a `__type` field in the
+JSON to dispatch to the correct type's `deserializeWithContext` method.
 
 ### Generic Type Parameters
-For generic unions like `type Result<T> = T | Error`, the generic type parameter `T`
-is passed through as-is since its concrete type is only known at the call site.
+
+For generic unions like `type Result<T> = T | Error`, the generic type parameter `T` is passed
+through as-is since its concrete type is only known at the call site.
 
 ### Mixed Unions
+
 Mixed unions (e.g., `string | Date | User`) check in order:
+
 1. Literal values
 2. Primitives (via `typeof`)
 3. Date (via `instanceof` or ISO string parsing)
 4. Serializable types (via `__type` dispatch)
-5. Generic type parameters (pass-through)
+5. Generic type parameters (pass-through)

package/docs/builtin-macros/deserialize/validation.md

@@ -3,19 +3,23 @@
 The macro supports 30+ validators via `@serde(validate(...))`:
 
 ### String Validators
+
 - `email`, `url`, `uuid` - Format validation
 - `minLength(n)`, `maxLength(n)`, `length(n)` - Length constraints
 - `pattern("regex")` - Regular expression matching
 - `nonEmpty`, `trimmed`, `lowercase`, `uppercase` - String properties
 
 ### Number Validators
+
 - `gt(n)`, `gte(n)`, `lt(n)`, `lte(n)`, `between(min, max)` - Range checks
 - `int`, `positive`, `nonNegative`, `finite` - Number properties
 
 ### Array Validators
+
 - `minItems(n)`, `maxItems(n)`, `itemsCount(n)` - Collection size
 
 ### Date Validators
+
 - `validDate`, `afterDate("ISO")`, `beforeDate("ISO")` - Date validation
 
 ## Field-Level Options
@@ -31,4 +35,4 @@ The `@serde` decorator supports:
 ## Container-Level Options
 
 - `denyUnknownFields` - Error on unrecognized JSON properties
-- `renameAll = "camelCase"` - Apply naming convention to all fields
+- `renameAll = "camelCase"` - Apply naming convention to all fields

package/docs/builtin-macros/deserialize.md

@@ -4,311 +4,6 @@ The `Deserialize` macro generates JSON deserialization methods with **cycle and
 forward-reference support**, plus comprehensive runtime validation. This enables
 safe parsing of complex JSON structures including circular references.
 
-## Generated Output
-
-| Type | Generated Code | Description |
-|------|----------------|-------------|
-| Class | `classNameDeserialize(input)` + `static deserialize(input)` | Standalone function + static factory method |
-| Enum | `enumNameDeserialize(input)`, `enumNameDeserializeWithContext(data)`, `enumNameIs(value)` | Standalone functions |
-| Interface | `interfaceNameDeserialize(input)`, etc. | Standalone functions |
-| Type Alias | `typeNameDeserialize(input)`, etc. | Standalone functions |
-
-## Return Type
-
-All public deserialization methods return `Result<T, Array<{ field: string; message: string }>>`:
-
-- `Result.ok(value)` - Successfully deserialized value
-- `Result.err(errors)` - Array of validation errors with field names and messages
-
-## Cycle/Forward-Reference Support
-
-Uses deferred patching to handle references:
-
-1. When encountering `{ "__ref": id }`, returns a `PendingRef` marker
-2. Continues deserializing other fields
-3. After all objects are created, `ctx.applyPatches()` resolves all pending references
-
-References only apply to object-shaped, serializable values. The generator avoids probing for
-`__ref` on primitive-like fields (including literal unions and `T | null` where `T` is primitive-like),
-and it parses `Date` / `Date | null` from ISO strings without treating them as references.
-
-## Validation
-
-The macro supports 30+ validators via `@serde(validate(...))`:
-
-### String Validators
-- `email`, `url`, `uuid` - Format validation
-- `minLength(n)`, `maxLength(n)`, `length(n)` - Length constraints
-- `pattern("regex")` - Regular expression matching
-- `nonEmpty`, `trimmed`, `lowercase`, `uppercase` - String properties
-
-### Number Validators
-- `gt(n)`, `gte(n)`, `lt(n)`, `lte(n)`, `between(min, max)` - Range checks
-- `int`, `positive`, `nonNegative`, `finite` - Number properties
-
-### Array Validators
-- `minItems(n)`, `maxItems(n)`, `itemsCount(n)` - Collection size
-
-### Date Validators
-- `validDate`, `afterDate("ISO")`, `beforeDate("ISO")` - Date validation
-
-## Field-Level Options
-
-The `@serde` decorator supports:
-
-- `skip` / `skipDeserializing` - Exclude field from deserialization
-- `rename = "jsonKey"` - Read from different JSON property
-- `default` / `default = expr` - Use default value if missing
-- `flatten` - Read fields from parent object level
-- `validate(...)` - Apply validators
-
-## Container-Level Options
-
-- `denyUnknownFields` - Error on unrecognized JSON properties
-- `renameAll = "camelCase"` - Apply naming convention to all fields
-
-## Union Type Deserialization
-
-Union types are deserialized based on their member types:
-
-### Literal Unions
-For unions of literal values (`"A" | "B" | 123`), the value is validated against
-the allowed literals directly.
-
-### Primitive Unions
-For unions containing primitive types (`string | number`), the deserializer uses
-`typeof` checks to validate the value type. No `__type` discriminator is needed.
-
-### Class/Interface Unions
-For unions of serializable types (`User | Admin`), the deserializer requires a
-`__type` field in the JSON to dispatch to the correct type's `deserializeWithContext` method.
-
-### Generic Type Parameters
-For generic unions like `type Result<T> = T | Error`, the generic type parameter `T`
-is passed through as-is since its concrete type is only known at the call site.
-
-### Mixed Unions
-Mixed unions (e.g., `string | Date | User`) check in order:
-1. Literal values
-2. Primitives (via `typeof`)
-3. Date (via `instanceof` or ISO string parsing)
-4. Serializable types (via `__type` dispatch)
-5. Generic type parameters (pass-through)
-
-## Example
-
-```typescript before
-/** @derive(Deserialize) @serde({ denyUnknownFields: true }) */
-class User {
-    id: number;
-
-    /** @serde({ validate: { email: true, maxLength: 255 } }) */
-    email: string;
-
-    /** @serde({ default: "guest" }) */
-    name: string;
-
-    /** @serde({ validate: { positive: true } }) */
-    age?: number;
-}
-```
-
-```typescript after
-import { DeserializeContext } from 'macroforge/serde';
-import { DeserializeError } from 'macroforge/serde';
-import type { DeserializeOptions } from 'macroforge/serde';
-import { PendingRef } from 'macroforge/serde';
-
-/** @serde({ denyUnknownFields: true }) */
-class User {
-    id: number;
-
-    email: string;
-
-    name: string;
-
-    age?: number;
-
-    constructor(props: {
-        id: number;
-        email: string;
-        name?: string;
-        age?: number;
-    }) {
-        this.id = props.id;
-        this.email = props.email;
-        this.name = props.name as string;
-        this.age = props.age as number;
-    }
-
-    /**
-     * Deserializes input to an instance of this class.
-     * Automatically detects whether input is a JSON string or object.
-     * @param input - JSON string or object to deserialize
-     * @param opts - Optional deserialization options
-     * @returns Result containing the deserialized instance or validation errors
-     */
-    static deserialize(
-        input: unknown,
-        opts?: @{DESERIALIZE_OPTIONS}
-    ): Result<
-        User,
-        Array<{
-            field: string;
-            message: string;
-        }>
-    > {
-        try {
-            // Auto-detect: if string, parse as JSON first
-            const data = typeof input === 'string' ? JSON.parse(input) : input;
-
-            const ctx = @{DESERIALIZE_CONTEXT}.create();
-            const resultOrRef = User.deserializeWithContext(data, ctx);
-            if (@{PENDING_REF}.is(resultOrRef)) {
-                return Result.err([
-                    {
-                        field: '_root',
-                        message: 'User.deserialize: root cannot be a forward reference'
-                    }
-                ]);
-            }
-            ctx.applyPatches();
-            if (opts?.freeze) {
-                ctx.freezeAll();
-            }
-            return Result.ok(resultOrRef);
-        } catch (e) {
-            if (e instanceof @{DESERIALIZE_ERROR}) {
-                return Result.err(e.errors);
-            }
-            const message = e instanceof Error ? e.message : String(e);
-            return Result.err([
-                {
-                    field: '_root',
-                    message
-                }
-            ]);
-        }
-    }
-
-    /** @internal */
-    static deserializeWithContext(value: any, ctx: @{DESERIALIZE_CONTEXT}): User | @{PENDING_REF} {
-        if (value?.__ref !== undefined) {
-            return ctx.getOrDefer(value.__ref);
-        }
-        if (typeof value !== 'object' || value === null || Array.isArray(value)) {
-            throw new @{DESERIALIZE_ERROR}([
-                {
-                    field: '_root',
-                    message: 'User.deserializeWithContext: expected an object'
-                }
-            ]);
-        }
-        const obj = value as Record<string, unknown>;
-        const errors: Array<{
-            field: string;
-            message: string;
-        }> = [];
-        const knownKeys = new Set(['__type', '__id', '__ref', 'id', 'email', 'name', 'age']);
-        for (const key of Object.keys(obj)) {
-            if (!knownKeys.has(key)) {
-                errors.push({
-                    field: key,
-                    message: 'unknown field'
-                });
-            }
-        }
-        if (!('id' in obj)) {
-            errors.push({
-                field: 'id',
-                message: 'missing required field'
-            });
-        }
-        if (!('email' in obj)) {
-            errors.push({
-                field: 'email',
-                message: 'missing required field'
-            });
-        }
-        if (errors.length > 0) {
-            throw new @{DESERIALIZE_ERROR}(errors);
-        }
-        const instance = Object.create(User.prototype) as User;
-        if (obj.__id !== undefined) {
-            ctx.register(obj.__id as number, instance);
-        }
-        ctx.trackForFreeze(instance);
-        {
-            const __raw_id = obj['id'] as number;
-            instance.id = __raw_id;
-        }
-        {
-            const __raw_email = obj['email'] as string;
-            instance.email = __raw_email;
-        }
-        if ('name' in obj && obj['name'] !== undefined) {
-            const __raw_name = obj['name'] as string;
-            instance.name = __raw_name;
-        } else {
-            instance.name = "guest";
-        }
-        if ('age' in obj && obj['age'] !== undefined) {
-            const __raw_age = obj['age'] as number;
-            instance.age = __raw_age;
-        }
-        if (errors.length > 0) {
-            throw new @{DESERIALIZE_ERROR}(errors);
-        }
-        return instance;
-    }
-
-    static validateField<K extends keyof User>(
-        field: K,
-        value: User[K]
-    ): Array<{
-        field: string;
-        message: string;
-    }> {
-        return [];
-    }
-
-    static validateFields(partial: Partial<User>): Array<{
-        field: string;
-        message: string;
-    }> {
-        return [];
-    }
-
-    static hasShape(obj: unknown): boolean {
-        if (typeof obj !== 'object' || obj === null || Array.isArray(obj)) {
-            return false;
-        }
-        const o = obj as Record<string, unknown>;
-        return 'id' in o && 'email' in o;
-    }
-
-    static is(obj: unknown): obj is User {
-        if (obj instanceof User) {
-            return true;
-        }
-        if (!User.hasShape(obj)) {
-            return false;
-        }
-        const result = User.deserialize(obj);
-        return Result.isOk(result);
-    }
-}
-
-// Usage:
-const result = User.deserialize('{"id":1,"email":"test@example.com"}');
-if (Result.isOk(result)) {
-    const user = result.value;
-} else {
-    console.error(result.error); // [{ field: "email", message: "must be a valid email" }]
-}
-```
-
-## Required Imports
-
-The generated code automatically imports:
-- `DeserializeContext`, `DeserializeError`, `PendingRef` from `macroforge/serde`
+See the original module documentation for full details on generated output,
+return types, cycle/forward-reference support, validation, field-level options,
+container-level options, and union type deserialization.

package/docs/builtin-macros/hash.md

@@ -21,10 +21,13 @@ Uses the standard polynomial rolling hash algorithm:
 ```text
 hash = 17  // Initial seed
 for each field:
-    hash = (hash * 31 + fieldHash) | 0  // Bitwise OR keeps it 32-bit integer
+    hash = (hash * 31 + fieldHash) | 0
 ```
 
-This algorithm is consistent with Java's `Objects.hash()` implementation.
+The `| 0` (bitwise OR with zero) at the end of each step coerces the result
+to a 32-bit signed integer, preventing floating-point drift from repeated
+multiplication. This is equivalent to casting to `i32` in Rust and consistent
+with Java's `Objects.hash()` implementation.
 
 ## Type-Specific Hashing
 
@@ -49,7 +52,7 @@ The `@hash` decorator supports:
 ## Example
 
 ```typescript before
-/** @derive(Hash, PartialEq) */
+/** @derive(Hash) */
 class User {
     id: number;
     name: string;
@@ -69,10 +72,6 @@ class User {
     static hashCode(value: User): number {
         return userHashCode(value);
     }
-
-    static equals(a: User, b: User): boolean {
-        return userEquals(a, b);
-    }
 }
 
 export function userHashCode(value: User): number {
@@ -92,11 +91,6 @@ export function userHashCode(value: User): number {
         0;
     return hash;
 }
-
-export function userEquals(a: User, b: User): boolean {
-    if (a === b) return true;
-    return a.id === b.id && a.name === b.name && a.cachedScore === b.cachedScore;
-}
 ```
 
 ## Hash Contract

package/docs/builtin-macros/partial-eq.md

@@ -40,12 +40,12 @@ The `@partialEq` decorator supports:
 ## Example
 
 ```typescript before
-/** @derive(PartialEq, Hash) */
+/** @derive(PartialEq) */
 class User {
     id: number;
     name: string;
 
-    /** @partialEq({ skip: true }) @hash({ skip: true }) */
+    /** @partialEq({ skip: true }) */
     cachedScore: number;
 }
 ```
@@ -60,34 +60,12 @@ class User {
     static equals(a: User, b: User): boolean {
         return userEquals(a, b);
     }
-
-    static hashCode(value: User): number {
-        return userHashCode(value);
-    }
 }
 
 export function userEquals(a: User, b: User): boolean {
     if (a === b) return true;
     return a.id === b.id && a.name === b.name;
 }
-
-export function userHashCode(value: User): number {
-    let hash = 17;
-    hash =
-        (hash * 31 +
-            (Number.isInteger(value.id)
-                ? value.id | 0
-                : value.id
-                      .toString()
-                      .split('')
-                      .reduce((h, c) => (h * 31 + c.charCodeAt(0)) | 0, 0))) |
-        0;
-    hash =
-        (hash * 31 +
-            (value.name ?? '').split('').reduce((h, c) => (h * 31 + c.charCodeAt(0)) | 0, 0)) |
-        0;
-    return hash;
-}
 ```
 
 ## Equality Contract
@@ -98,55 +76,5 @@ When implementing `PartialEq`, consider also implementing `Hash`:
 - **Symmetry**: `a.equals(b)` implies `b.equals(a)`
 - **Hash consistency**: Equal objects must have equal hash codes
 
-To maintain the hash contract, skip the same fields in both `PartialEq` and `Hash`:
-
-```typescript before
-/** @derive(PartialEq, Hash) */
-class User {
-    id: number;
-    name: string;
-
-    /** @partialEq({ skip: true }) @hash({ skip: true }) */
-    cachedScore: number;
-}
-```
-
-```typescript after
-class User {
-    id: number;
-    name: string;
-
-    cachedScore: number;
-
-    static equals(a: User, b: User): boolean {
-        return userEquals(a, b);
-    }
-
-    static hashCode(value: User): number {
-        return userHashCode(value);
-    }
-}
-
-export function userEquals(a: User, b: User): boolean {
-    if (a === b) return true;
-    return a.id === b.id && a.name === b.name;
-}
-
-export function userHashCode(value: User): number {
-    let hash = 17;
-    hash =
-        (hash * 31 +
-            (Number.isInteger(value.id)
-                ? value.id | 0
-                : value.id
-                      .toString()
-                      .split('')
-                      .reduce((h, c) => (h * 31 + c.charCodeAt(0)) | 0, 0))) |
-        0;
-    hash =
-        (hash * 31 +
-            (value.name ?? '').split('').reduce((h, c) => (h * 31 + c.charCodeAt(0)) | 0, 0)) |
-        0;
-    return hash;
-}
-```
+To maintain the hash contract, skip the same fields in both `PartialEq` and `Hash`,
+as shown in the example above using `@partialEq({ skip: true }) @hash({ skip: true })`.

package/docs/builtin-macros/partial-ord.md

@@ -9,18 +9,20 @@ between values where some pairs may be incomparable.
 | Type | Generated Code | Description |
 |------|----------------|-------------|
 | Class | `classNamePartialCompare(a, b)` + `static compareTo(a, b)` | Standalone function + static wrapper method |
-| Enum | `enumNamePartialCompare(a: EnumName, b: EnumName): Option<number>` | Standalone function returning Option |
-| Interface | `interfaceNamePartialCompare(a: InterfaceName, b: InterfaceName): Option<number>` | Standalone function with Option |
-| Type Alias | `typeNamePartialCompare(a: TypeName, b: TypeName): Option<number>` | Standalone function with Option |
+| Enum | `enumNamePartialCompare(a, b): number \| null` | Standalone function returning `number \| null` |
+| Interface | `ifaceNamePartialCompare(a, b): number \| null` | Standalone function returning `number \| null` |
+| Type Alias | `typeNamePartialCompare(a, b): number \| null` | Standalone function returning `number \| null` |
+
+Names use **camelCase** conversion (e.g., `Temperature` → `temperaturePartialCompare`).
 
 ## Return Values
 
-Unlike `Ord`, `PartialOrd` returns an `Option<number>` to handle incomparable values:
+Unlike `Ord`, `PartialOrd` returns `number | null` to handle incomparable values:
 
-- **Option.some(-1)**: `a` is less than `b`
-- **Option.some(0)**: `a` is equal to `b`
-- **Option.some(1)**: `a` is greater than `b`
-- **Option.none()**: Values are incomparable
+- **-1**: `a` is less than `b`
+- **0**: `a` is equal to `b`
+- **1**: `a` is greater than `b`
+- **null**: Values are incomparable
 
 ## When to Use PartialOrd vs Ord
 
@@ -36,8 +38,8 @@ Unlike `Ord`, `PartialOrd` returns an `Option<number>` to handle incomparable va
 Fields are compared **lexicographically** in declaration order:
 
 1. Compare first field
-2. If incomparable, return `Option.none()`
-3. If not equal, return that result wrapped in `Option.some()`
+2. If incomparable, return `null`
+3. If not equal, return that result
 4. Otherwise, compare next field
 5. Continue until a difference is found or all fields are equal
 
@@ -45,13 +47,13 @@ Fields are compared **lexicographically** in declaration order:
 
 | Type | Comparison Method |
 |------|-------------------|
-| `number`/`bigint` | Direct comparison, returns some() |
-| `string` | `localeCompare()` wrapped in some() |
-| `boolean` | false &lt; true, wrapped in some() |
-| null/undefined | Returns none() for mismatched nullability |
-| Arrays | Lexicographic, propagates none() on incomparable elements |
-| `Date` | Timestamp comparison, none() if invalid |
-| Objects | Unwraps nested Option from compareTo() |
+| `number`/`bigint` | Direct subtraction (`a - b`) |
+| `string` | `localeCompare()` |
+| `boolean` | `false < true` (cast to number) |
+| null/undefined | Returns `null` for mismatched nullability |
+| Arrays | Lexicographic, propagates `null` on incomparable elements |
+| `Date` | Timestamp comparison, `null` if invalid |
+| Objects | Delegates to `compareTo()` if available |
 
 ## Field-Level Options
 

package/docs/builtin-macros/serialize.md

@@ -94,7 +94,7 @@ class User {
 @param value - The value to serialize
 @param ctx - The serialization context  */
 
-    static serializeWithContext(value: User, ctx: @{SERIALIZE_CONTEXT}): Record<string, unknown> {
+    static serializeWithContext(value: User, ctx: @SERIALIZE_CONTEXT): Record<string, unknown> {
         return userSerializeWithContext(value, ctx);
     }
 }
@@ -104,7 +104,7 @@ class User {
 @returns JSON string representation with cycle detection metadata */ export function userSerialize(
     value: User
 ): string {
-    const ctx = @{SERIALIZE_CONTEXT}.create();
+    const ctx = @SERIALIZE_CONTEXT.create();
     return JSON.stringify(userSerializeWithContext(value, ctx));
 } /** @internal Serializes with an existing context for nested/cyclic object graphs.
 @param value - The value to serialize
@@ -123,7 +123,7 @@ export function userSerializeWithContext(
     result['userName'] = value.name;
     {
         const __flattened = userMetadataSerializeWithContext(value.metadata, ctx);
-        const { __type: _, __id: __, ...rest } = __flattened as any;
+        const { __type: _, __id: __, ...rest } = __flattened as any; // tag field name is configurable via `tag` option
         Object.assign(result, rest);
     }
     return result;

package/docs/integration/cli.md

@@ -21,7 +21,7 @@ Or build from source:
 Bash
 
 ```
-git clone https://github.com/rymskip/macroforge-ts.git
+git clone https://github.com/macroforge-ts/macroforge-ts.git
 cd macroforge-ts/crates
 cargo build --release --bin macroforge
 

package/docs/language-servers/ls-overview.md

@@ -25,7 +25,7 @@ and editors.
 The language servers are functional and used during development of macroforge itself. However, they
 require manual installation:
 
-1. Fork or clone the [macroforge-ts repository](https://github.com/rymskip/macroforge-ts)
+1. Fork or clone the [macroforge-ts repository](https://github.com/macroforge-ts/macroforge-ts)
 2. Build the extension you need
 3. Install it as a developer extension in your editor
 

package/docs/language-servers/svelte-ls.md

@@ -25,7 +25,7 @@ This package is not yet published as an official extension. You'll need to build
 ### 1. Clone the Repository
 
 ```bash
-git clone https://github.com/rymskip/macroforge-ts.git
+git clone https://github.com/macroforge-ts/macroforge-ts.git
 cd macroforge-ts
 ```
 

package/docs/language-servers/svelte.md

@@ -23,7 +23,7 @@ manually.
 Bash
 
 ```
-git clone https://github.com/rymskip/macroforge-ts.git
+git clone https://github.com/macroforge-ts/macroforge-ts.git
 cd macroforge-ts
 ```
 

package/docs/language-servers/zed-extensions.md

@@ -20,7 +20,7 @@ These extensions are not yet in the Zed extension registry. You'll need to insta
 ### 1. Clone the Repository
 
 ```bash
-git clone https://github.com/rymskip/macroforge-ts.git
+git clone https://github.com/macroforge-ts/macroforge-ts.git
 cd macroforge-ts
 ```
 

package/docs/language-servers/zed.md

@@ -22,7 +22,7 @@ extensions.
 Bash
 
 ```
-git clone https://github.com/rymskip/macroforge-ts.git
+git clone https://github.com/macroforge-ts/macroforge-ts.git
 cd macroforge-ts
 ```
 

package/docs/roadmap/roadmap.md

@@ -73,7 +73,7 @@ Improvements to the developer experience.
 
 Interested in helping? We welcome contributions of all kinds:
 
-- Feature requests and feedback on [GitHub Issues](https://github.com/rymskip/macroforge-ts/issues)
+- Feature requests and feedback on [GitHub Issues](https://github.com/macroforge-ts/macroforge-ts/issues)
 - Pull requests for new macros or improvements
 - Documentation improvements
 - Framework integrations

package/docs/sections.json

@@ -63,65 +63,12 @@
     "path": "builtin-macros/serialize.md",
     "use_cases": "toJSON, serialization, json, api, data transfer"
   },
-  {
-    "id": "deserialize/overview",
-    "title": "Deserialize: Overview",
-    "category": "builtin-macros",
-    "category_title": "Built-in Macros",
-    "path": "builtin-macros/deserialize/overview.md",
-    "use_cases": "fromJSON, deserialization, deserialize, classnamedeserialize(input), enumnamedeserialize(input)",
-    "parent_id": "deserialize"
-  },
-  {
-    "id": "deserialize/cycleforward-reference-support",
-    "title": "Deserialize: Cycle/Forward-Reference Support",
-    "category": "builtin-macros",
-    "category_title": "Built-in Macros",
-    "path": "builtin-macros/deserialize/cycleforward-reference-support.md",
-    "use_cases": "fromJSON, deserialization, pendingref, ctx.applypatches(), __ref",
-    "parent_id": "deserialize"
-  },
-  {
-    "id": "deserialize/validation",
-    "title": "Deserialize: Validation",
-    "category": "builtin-macros",
-    "category_title": "Built-in Macros",
-    "path": "builtin-macros/deserialize/validation.md",
-    "use_cases": "fromJSON, deserialization, @serde(validate(...)), email, url, uuid",
-    "parent_id": "deserialize"
-  },
-  {
-    "id": "deserialize/union-type-deserialization",
-    "title": "Deserialize: Union Type Deserialization",
-    "category": "builtin-macros",
-    "category_title": "Built-in Macros",
-    "path": "builtin-macros/deserialize/union-type-deserialization.md",
-    "use_cases": "fromJSON, deserialization, typeof, __type",
-    "parent_id": "deserialize"
-  },
-  {
-    "id": "deserialize/example",
-    "title": "Deserialize: Example",
-    "category": "builtin-macros",
-    "category_title": "Built-in Macros",
-    "path": "builtin-macros/deserialize/example.md",
-    "use_cases": "fromJSON, deserialization",
-    "parent_id": "deserialize"
-  },
   {
     "id": "deserialize",
     "title": "Deserialize",
     "category": "builtin-macros",
     "category_title": "Built-in Macros",
     "path": "builtin-macros/deserialize.md",
-    "use_cases": "fromJSON, deserialization, parsing, validation, json",
-    "is_chunked": true,
-    "chunk_ids": [
-      "deserialize/overview",
-      "deserialize/cycleforward-reference-support",
-      "deserialize/validation",
-      "deserialize/union-type-deserialization",
-      "deserialize/example"
-    ]
+    "use_cases": "fromJSON, deserialization, parsing, validation, json"
   }
 ]

package/package.json

@@ -25,7 +25,7 @@
   "main": "dist/index.js",
   "name": "@macroforge/mcp-server",
   "peerDependencies": {
-    "macroforge": "^0.1.77"
+    "macroforge": "file:../../crates/macroforge_ts"
   },
   "peerDependenciesMeta": {
     "macroforge": {
@@ -34,7 +34,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/macroforge-ts/mcp-server.git"
+    "url": "git+https://github.com/macroforge-ts/macroforge-ts.git"
   },
   "scripts": {
     "build": "deno install --node-modules-dir --quiet && deno run -A npm:typescript@5/tsc && chmod +x dist/index.js",
@@ -46,5 +46,5 @@
     "test": "node --test tests/**/*.test.js"
   },
   "type": "module",
-  "version": "0.1.77"
+  "version": "0.1.79"
 }