@agentdock/crypto 0.0.47 → 0.0.48

package/README.md

@@ -66,7 +66,7 @@ const result = await authChallenge(seed: Uint8Array);
 const valid = await verifyChallenge(challenge, signature, publicKey);
 ```
 
-**注意**：直接使用 seed 作为 Ed25519 种子，不做额外 deriveKey（与 Happy 对齐，见 L23）。
+**注意**：直接使用 seed 作为 Ed25519 种子，不做额外 deriveKey。
 
 ### NaCl Box (box.ts)
 
@@ -99,7 +99,7 @@ const plaintext = decryptSecretBox(bundle, secret);
 import { deriveSecretKeyTreeRoot, deriveSecretKeyTreeChild, deriveKey } from '@agentdock/crypto';
 
 // 从根密钥 + 标签派生子密钥
-const root = await deriveSecretKeyTreeRoot(masterSecret, 'Happy EnCoder');
+const root = await deriveSecretKeyTreeRoot(masterSecret, 'my-app');
 const child = await deriveSecretKeyTreeChild(root, 'content');
 
 // 底层：HKDF-SHA512 派生
@@ -111,7 +111,7 @@ const key = await deriveKey(secret, label, segments);
 ```typescript
 import { deriveContentKeyPair } from '@agentdock/crypto';
 
-// 'Happy EnCoder' + ['content'] + SHA-512[0:32] → NaCl Box keypair
+// domainSeparation + ['content'] + SHA-512[0:32] → NaCl Box keypair
 const { publicKey, secretKey } = await deriveContentKeyPair(secret);
 ```
 
@@ -142,5 +142,5 @@ pnpm --filter @agentdock/crypto test:coverage
 
 - **Web Crypto API 优先**：AES-GCM、HKDF、HMAC 全走 `crypto.subtle`，不引入额外依赖
 - **tweetnacl 用于 NaCl**：Box/SecretBox 使用 tweetnacl，因为 Web Crypto 不支持 X25519 Box
-- **密钥派生路径与 Happy 完全一致**：确保两端互操作（L23 教训）
+- **密钥派生路径确定性**：确保两端互操作
 - **TypeScript `as BufferSource` 断言**：TS 5.7 的 Uint8Array 类型不兼容 Web Crypto（L7 教训）

package/dist/aes.d.ts

@@ -1,7 +1,7 @@
 /**
  * AES-256-GCM encryption and decryption using the Web Crypto API.
  *
- * Bundle format (compatible with Happy protocol):
+ * Bundle format:
  *   version (1 byte) | nonce (12 bytes) | ciphertext + authTag
  *
  * - version: always 0 for this implementation

package/dist/auth.d.ts

@@ -1,10 +1,10 @@
 /**
- * Ed25519 authentication challenge — aligned with Happy.
+ * Ed25519 authentication challenge.
  *
  * Uses tweetnacl for Ed25519 signing/verification, which works in
  * ALL contexts (including non-secure HTTP). The raw 32-byte seed is
  * used directly as the Ed25519 private key seed, WITHOUT any extra
- * key derivation step, matching Happy's tweetnacl.sign.keyPair.fromSeed().
+ * key derivation step.
  *
  * Previous implementation used Web Crypto API (crypto.subtle) which
  * requires a secure context (HTTPS or localhost). This broke mobile
@@ -24,7 +24,7 @@ export type AuthChallengeResult = {
  * derived from the given seed.
  *
  * The seed is used directly as the Ed25519 private key seed (no extra
- * key derivation), matching Happy's tweetnacl.sign.keyPair.fromSeed().
+ * key derivation).
  *
  * @param seed - 32-byte seed for deterministic Ed25519 key pair
  * @returns Challenge result with random nonce, public key, and signature

package/dist/box.d.ts

@@ -1,5 +1,5 @@
 /**
- * NaCl Box encryption — aligned with Happy.
+ * NaCl Box encryption.
  *
  * Ephemeral X25519 Diffie-Hellman key agreement + authenticated encryption.
  * Used for encrypting data for a specific recipient (key delivery).

package/dist/content.d.ts

@@ -1,8 +1,7 @@
 /**
- * Content keypair derivation — aligned with Happy.
+ * Content keypair derivation.
  *
  * Derives an X25519 NaCl Box keypair from a secret using the key tree.
- * Usage string: 'Happy EnCoder', path: ['content'].
  *
  * The derived seed is SHA-512 hashed and the first 32 bytes become the
  * Box secret key, matching libsodium's crypto_box_seed_keypair behavior.
@@ -10,8 +9,7 @@
 /**
  * Derive a NaCl Box keypair for content encryption.
  *
- * Follows Happy's deriveContentKeyPair():
- * 1. deriveKey(secret, 'Happy EnCoder', ['content']) → 32-byte seed
+ * 1. deriveKey(secret, usage, path) → 32-byte seed
  * 2. SHA-512(seed)[0:32] → box secret key (matching libsodium)
  * 3. tweetnacl.box.keyPair.fromSecretKey(boxSecretKey) → keypair
  *
@@ -23,7 +21,7 @@
  * @param secret - Master secret for key derivation
  * @returns NaCl Box keypair { publicKey, secretKey }
  */
-export declare function deriveContentKeyPair(secret: Uint8Array): Promise<{
+export declare function deriveContentKeyPair(secret: Uint8Array, derivationVersion?: number): Promise<{
     readonly publicKey: Uint8Array;
     readonly secretKey: Uint8Array;
 }>;

package/dist/content.js

@@ -1 +1 @@
-"use strict";import o from"tweetnacl";import{deriveKey as c}from"./keys.js";export async function deriveContentKeyPair(r){const t=await c(r,"Happy EnCoder",["content"]),n=await crypto.subtle.digest("SHA-512",t),i=new Uint8Array(n).slice(0,32),e=o.box.keyPair.fromSecretKey(i);return{publicKey:new Uint8Array(e.publicKey),secretKey:new Uint8Array(e.secretKey)}}
+"use strict";import c from"tweetnacl";import{deriveKey as i}from"./keys.js";export async function deriveContentKeyPair(r,t){const n=await i(r,t===1?"CCPark EnCoder":"Happy EnCoder",["content"]),o=await crypto.subtle.digest("SHA-512",n),a=new Uint8Array(o).slice(0,32),e=c.box.keyPair.fromSecretKey(a);return{publicKey:new Uint8Array(e.publicKey),secretKey:new Uint8Array(e.secretKey)}}

package/dist/secretbox.d.ts

@@ -1,5 +1,5 @@
 /**
- * NaCl SecretBox encryption — aligned with Happy.
+ * NaCl SecretBox encryption.
  *
  * Symmetric authenticated encryption (XSalsa20-Poly1305).
  * Used for legacy encryption mode.

package/dist/session.d.ts

@@ -2,7 +2,7 @@
  * Session encryption — high-level API composing AES-GCM + NaCl Box.
  *
  * Provides per-session data encryption key (DEK) generation, wrapping,
- * unwrapping, and envelope encrypt/decrypt. Compatible with Happy protocol.
+ * unwrapping, and envelope encrypt/decrypt.
  *
  * Key flow:
  *   masterSecret → deriveContentKeyPair → contentPublicKey
@@ -20,7 +20,7 @@
  * @param masterSecret - 32-byte master secret shared between daemon and web
  * @returns DEK (for local use) and wrappedDekBase64 (for server storage)
  */
-export declare function generateSessionKeys(masterSecret: Uint8Array): Promise<{
+export declare function generateSessionKeys(masterSecret: Uint8Array, derivationVersion?: number): Promise<{
     readonly dek: Uint8Array;
     readonly wrappedDekBase64: string;
 }>;
@@ -36,7 +36,7 @@ export declare function generateSessionKeys(masterSecret: Uint8Array): Promise<{
  * @param masterSecret - Same master secret used during generation
  * @returns 32-byte DEK, or null if unwrapping fails
  */
-export declare function unwrapSessionKey(wrappedDekBase64: string, masterSecret: Uint8Array): Promise<Uint8Array | null>;
+export declare function unwrapSessionKey(wrappedDekBase64: string, masterSecret: Uint8Array, derivationVersion?: number): Promise<Uint8Array | null>;
 /**
  * Encrypt a SessionEnvelope (or any JSON-serializable value) for transmission.
  *

package/dist/session.js

@@ -1 +1 @@
-"use strict";import{encryptAesGcm as i,decryptAesGcm as y}from"./aes.js";import{encryptBox as d,decryptBox as f}from"./box.js";import{deriveContentKeyPair as l}from"./content.js";import{getRandomBytes as m}from"./random.js";import{encodeBase64 as u,decodeBase64 as p}from"./encoding.js";const a=0,s=32,E=57+s;export async function generateSessionKeys(n){const{publicKey:t}=await l(n),e=m(s),o=d(e,t),r=new Uint8Array(1+o.length);return r[0]=a,r.set(o,1),{dek:e,wrappedDekBase64:u(r)}}export async function unwrapSessionKey(n,t){let e;try{e=p(n)}catch{return null}if(e.length<E||e[0]!==a)return null;const o=e.slice(1),{secretKey:r}=await l(t),c=f(o,r);return!c||c.length!==s?null:c}export async function encryptEnvelope(n,t){const e=await i(n,t);return u(e)}export async function decryptEnvelope(n,t){let e;try{e=p(n)}catch{return null}return e.length===0?null:y(e,t)}
+"use strict";import{encryptAesGcm as y,decryptAesGcm as d}from"./aes.js";import{encryptBox as f,decryptBox as m}from"./box.js";import{deriveContentKeyPair as u}from"./content.js";import{getRandomBytes as E}from"./random.js";import{encodeBase64 as p,decodeBase64 as a}from"./encoding.js";const i=0,l=32,w=57+l;export async function generateSessionKeys(n,t){const{publicKey:e}=await u(n,t),r=E(l),c=f(r,e),o=new Uint8Array(1+c.length);return o[0]=i,o.set(c,1),{dek:r,wrappedDekBase64:p(o)}}export async function unwrapSessionKey(n,t,e){let r;try{r=a(n)}catch{return null}if(r.length<w||r[0]!==i)return null;const c=r.slice(1),{secretKey:o}=await u(t,e),s=m(c,o);return!s||s.length!==l?null:s}export async function encryptEnvelope(n,t){const e=await y(n,t);return p(e)}export async function decryptEnvelope(n,t){let e;try{e=a(n)}catch{return null}return e.length===0?null:d(e,t)}

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@agentdock/crypto",
-  "version": "0.0.47",
+  "version": "0.0.48",
   "description": "E2E encryption for AgentDock — AES-256-GCM, key derivation, Web Crypto API",
   "license": "UNLICENSED",
-  "author": "kevin8536945",
+  "author": "CCPark",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "tweetnacl": "^1.0.3",
-    "@agentdock/wire": "0.0.47"
+    "@agentdock/wire": "0.0.48"
   },
   "devDependencies": {
     "@vitest/coverage-v8": "^3.0.0",