rjcorwin · rjcorwin · Sep 29, 2025
diff --git a/AGENTS.md b/AGENTS.md
@@ -2,41 +2,46 @@
 
 ## Critical Docs (READ FIRST AND UPDATE AFTER COMPLETING WORK)
 - MEW Protocol: spec/draft/SPEC.md
-- SDK: sdk/spec/draft/SPEC.md
-- CLI: cli/spec/draft/SPEC.md
+- Unified package: packages/mew/spec/draft/SPEC.md
+- CLI reference: packages/mew/spec/draft
 
 ## Repository Structure
 ```
-sdk/typescript-sdk/    # Core packages
-  types/              # @mew-protocol/types - Core types
-  capability-matcher/ # Pattern matching
-  client/            # WebSocket client
-  participant/       # MCP participant
-  agent/            # AI agent
-  gateway/          # Gateway server
-bridge/             # MCP-MEW bridge
-cli/               # Command-line tool
-tests/             # Integration tests (scenario-*)
-spec/              # Protocol specs (v0.4=current, draft=next)
-docs/              # Guides in architecture/, guides/, bugs/, progress/
+packages/mew/         # Unified @mew-protocol/mew package
+  src/
+    types/            # Protocol type definitions
+    capability-matcher/
+    client/
+    participant/
+    agent/
+    bridge/
+    cli/             # CLI implementation
+    bin/             # mew, mew-agent, mew-bridge shims
+    gateway/         # Gateway command wiring
+  templates/         # Bundled space templates
+  config/            # Example configuration files
+  dist/              # Build output (generated)
+tests/               # Integration tests (scenario-*)
+spec/                # Protocol specs (v0.4=current, draft=next)
+docs/                # Guides in architecture/, guides/, bugs/, progress/
 ```
 
 ## Package Dependencies
 ```
 types → capability-matcher → participant → agent
      → client → participant
-     → gateway
+     → bridge
 ```
 
 ## Common Commands
 ```bash
-npm install          # Setup
-npm run build        # Build all (uses TypeScript project references)
-npm run build:watch  # Dev mode
-npm test            # Run tests
-./tests/run-all-tests.sh  # All integration tests
+npm install                                    # Setup
+npm run build                                  # Build @mew-protocol/mew
+npm run build:watch -- --workspace @mew-protocol/mew
+npm test                                       # Run repo smoke tests
+./tests/run-all-tests.sh                       # All integration tests
 
-# Use local CLI for testing (not global mew)
+# Use local CLI wrapper for testing (not global mew)
 ./cli/bin/mew.js space up
 ```
 
@@ -82,7 +87,7 @@ curl -v -X POST ...  # Shows request/response headers
 4. Check TypeScript errors with `npm run lint`
 
 ## Key Files
-- Protocol types: `sdk/typescript-sdk/types/src/protocol.ts`
+- Protocol types: `packages/mew/src/types/protocol.ts`
 - Message flow: See spec Section 3
 - Test examples: `tests/scenario-*/`
 - TODOs: `docs/progress/TODO.md`

diff --git a/CLAUDE.md b/CLAUDE.md
@@ -2,41 +2,46 @@
 
 ## Critical Docs (READ FIRST AND UPDATE AFTER COMPLETING WORK)
 - MEW Protocol: spec/draft/SPEC.md
-- SDK: sdk/spec/draft/SPEC.md
-- CLI: cli/spec/draft/SPEC.md
+- Unified package: packages/mew/spec/draft/SPEC.md
+- CLI reference: packages/mew/spec/draft
 
 ## Repository Structure
 ```
-sdk/typescript-sdk/    # Core packages
-  types/              # @mew-protocol/types - Core types
-  capability-matcher/ # Pattern matching
-  client/            # WebSocket client
-  participant/       # MCP participant
-  agent/            # AI agent
-  gateway/          # Gateway server
-bridge/             # MCP-MEW bridge
-cli/               # Command-line tool
-tests/             # Integration tests (scenario-*)
-spec/              # Protocol specs (v0.4=current, draft=next)
-docs/              # Guides in architecture/, guides/, bugs/, progress/
+packages/mew/         # Unified @mew-protocol/mew package
+  src/
+    types/
+    capability-matcher/
+    client/
+    participant/
+    agent/
+    bridge/
+    cli/
+    bin/
+    gateway/
+  templates/
+  config/
+  dist/
+tests/                # Integration tests (scenario-*)
+spec/                 # Protocol specs (v0.4=current, draft=next)
+docs/                 # Guides in architecture/, guides/, bugs/, progress/
 ```
 
 ## Package Dependencies
 ```
 types → capability-matcher → participant → agent
      → client → participant
-     → gateway
+     → bridge
 ```
 
 ## Common Commands
 ```bash
-npm install          # Setup
-npm run build        # Build all (uses TypeScript project references)
-npm run build:watch  # Dev mode
-npm test            # Run tests
-./tests/run-all-tests.sh  # All integration tests
+npm install                                    # Setup
+npm run build                                  # Build @mew-protocol/mew
+npm run build:watch -- --workspace @mew-protocol/mew
+npm test                                       # Run repo smoke tests
+./tests/run-all-tests.sh                       # All integration tests
 
-# Use local CLI for testing (not global mew)
+# Use local CLI wrapper for testing (not global mew)
 ./cli/bin/mew.js space up
 ```
 
@@ -82,7 +87,7 @@ curl -v -X POST ...  # Shows request/response headers
 4. Check TypeScript errors with `npm run lint`
 
 ## Key Files
-- Protocol types: `sdk/typescript-sdk/types/src/protocol.ts`
+- Protocol types: `packages/mew/src/types/protocol.ts`
 - Message flow: See spec Section 3
 - Test examples: `tests/scenario-*/`
 - TODOs: `docs/progress/TODO.md`

diff --git a/RELEASE.md b/RELEASE.md
@@ -166,10 +166,10 @@ After SDK and bridge packages are published, update ALL CLI template dependencie
 #### Find All Templates
 ```bash
 # List all template directories
-ls cli/templates/
+ls packages/mew/templates/
 
 # Find all package.json files in templates
-find cli/templates -name "package.json" -type f
+find packages/mew/templates -name "package.json" -type f
 ```
 
 #### Update Template Dependencies
@@ -178,10 +178,10 @@ For each template that has MEW protocol dependencies, update the `package.json`:
 ```bash
 # Example process for each template:
 # 1. Check if template has MEW dependencies
-grep "@mew-protocol" cli/templates/TEMPLATE_NAME/package.json
+grep "@mew-protocol" packages/mew/templates/TEMPLATE_NAME/package.json
 
 # 2. If it does, update versions to match newly published packages
-# Edit cli/templates/TEMPLATE_NAME/package.json
+# Edit packages/mew/templates/TEMPLATE_NAME/package.json
 ```
 
 **Common MEW dependencies to update:**
@@ -198,20 +198,20 @@ grep "@mew-protocol" cli/templates/TEMPLATE_NAME/package.json
 ```
 
 #### Current Templates (as of this guide)
-- `cli/templates/coder-agent/` - Has MEW dependencies
-- `cli/templates/note-taker/` - Minimal dependencies
+- `packages/mew/templates/coder-agent/` - Has MEW dependencies
+- `packages/mew/templates/note-taker/` - Minimal dependencies
 - *(Future templates will be automatically covered by this process)*
 
 #### Verification
 ```bash
 # Verify all templates reference correct versions
-grep -r "@mew-protocol" cli/templates/*/package.json
+grep -r "@mew-protocol" packages/mew/templates/*/package.json
 ```
 
 #### Commit Template Updates
 ```bash
 # Add template changes
-git add cli/templates/*/package.json
+git add packages/mew/templates/*/package.json
 
 # Commit template updates
 git commit -m "Update CLI templates to use latest package versions
@@ -226,7 +226,7 @@ git push origin main
 ### Phase 6: CLI Package
 
 ```bash
-cd cli
+cd packages/mew
 npm publish --access public --otp=YOUR_OTP
 ```
 

diff --git a/bridge/eslint.config.mjs b/bridge/eslint.config.mjs
diff --git a/bridge/package.json b/bridge/package.json
diff --git a/bridge/tsconfig.json b/bridge/tsconfig.json
diff --git a/cli/.prettierrc b/cli/.prettierrc