struere 0.4.2 → 0.4.4

package/dist/cli/index.js

@@ -243,8 +243,11 @@ async function syncOrganization(payload) {
     const error = await response.text();
     return { success: false, error };
   }
-  const result = await response.json();
-  return result;
+  const json = await response.json();
+  if (json.status === "success" && json.value) {
+    return json.value;
+  }
+  return { success: false, error: "Unexpected response format" };
 }
 async function getSyncState() {
   const credentials = loadCredentials();
@@ -293,8 +296,11 @@ async function deployAllAgents() {
     const error = await response.text();
     return { success: false, error };
   }
-  const result = await response.json();
-  return result;
+  const json = await response.json();
+  if (json.status === "success" && json.value) {
+    return json.value;
+  }
+  return { success: false, error: "Unexpected response format" };
 }
 
 // src/cli/commands/login.ts
@@ -664,10 +670,10 @@ function getIndexTs(type) {
 function getToolsIndexTs() {
   return `import { defineTools } from 'struere'
 
-export const tools = defineTools([
+export default defineTools([
   {
     name: 'get_current_time',
-    description: 'Get the current date and time',
+    description: 'Get the current date and time in a specific timezone',
     parameters: {
       type: 'object',
       properties: {
@@ -677,19 +683,59 @@ export const tools = defineTools([
         },
       },
     },
-    handler: async (params) => {
-      const timezone = (params.timezone as string) || 'UTC'
+    handler: async (args, context, fetch) => {
+      const timezone = (args.timezone as string) || 'UTC'
       const now = new Date()
       return {
         timestamp: now.toISOString(),
         formatted: now.toLocaleString('en-US', { timeZone: timezone }),
         timezone,
+        organizationId: context.organizationId,
       }
     },
   },
-])
 
-export default tools
+  {
+    name: 'send_slack_message',
+    description: 'Send a message to a Slack channel via webhook',
+    parameters: {
+      type: 'object',
+      properties: {
+        message: {
+          type: 'string',
+          description: 'The message to send',
+        },
+        channel: {
+          type: 'string',
+          description: 'Channel name (for logging purposes)',
+        },
+      },
+      required: ['message'],
+    },
+    handler: async (args, context, fetch) => {
+      const webhookUrl = process.env.SLACK_WEBHOOK_URL
+      if (!webhookUrl) {
+        return { success: false, error: 'SLACK_WEBHOOK_URL not configured' }
+      }
+
+      const response = await fetch(webhookUrl, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({
+          text: args.message,
+          username: 'Struere Agent',
+        }),
+      })
+
+      return {
+        success: response.ok,
+        status: response.status,
+        actorId: context.actorId,
+        actorType: context.actorType,
+      }
+    },
+  },
+])
 `;
 }
 function getStruereJsonV2(orgId, orgSlug, orgName) {
@@ -723,123 +769,430 @@ function getPackageJsonV2(name) {
   }, null, 2);
 }
 function getClaudeMDV2(orgName) {
-  return `# ${orgName} - Struere Project
+  return `# ${orgName} - Struere Workspace
+
+> **This is a workspace project**, not the Struere framework source code. You define agents, entity types, roles, and custom tools here. The CLI syncs them to Convex. Framework source: github.com/struere/struere
 
-This is a Struere organization project. Struere is a framework for building production AI agents with built-in data management, RBAC permissions, and job scheduling.
+Struere is a framework for building production AI agents with Convex as the real-time backend. Agents can manage entities (business data), emit events, and schedule background jobs\u2014all with built-in RBAC permissions.
+
+## How It Works
+
+\`\`\`
+\u250C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2510
+\u2502  Your Project (this folder)                                     \u2502
+\u2502  \u251C\u2500\u2500 agents/*.ts      \u2192 Agent configs synced to Convex          \u2502
+\u2502  \u251C\u2500\u2500 entity-types/*.ts \u2192 Schema definitions synced to Convex    \u2502
+\u2502  \u251C\u2500\u2500 roles/*.ts        \u2192 RBAC policies synced to Convex         \u2502
+\u2502  \u2514\u2500\u2500 tools/index.ts    \u2192 Custom tools (handlers run on CF Worker)\u2502
+\u2514\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u252C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2518
+                      \u2502 struere dev (watches & syncs)
+                      \u25BC
+\u250C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2510
+\u2502  Convex (Real-time Backend)                                      \u2502
+\u2502  \u2022 Stores agent configs, entities, events, jobs                  \u2502
+\u2502  \u2022 Runs LLM calls (Anthropic/OpenAI)                             \u2502
+\u2502  \u2022 Enforces RBAC on every operation                              \u2502
+\u2502  \u2022 Executes custom tools via Cloudflare Worker                   \u2502
+\u2514\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u252C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2518
+                      \u2502 HTTP API
+                      \u25BC
+\u250C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2510
+\u2502  Clients                                                         \u2502
+\u2502  \u2022 Dashboard (chat UI, entity browser)                           \u2502
+\u2502  \u2022 Your app (REST API with Bearer token)                         \u2502
+\u2502  \u2022 WhatsApp/Webhooks                                             \u2502
+\u2514\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2518
+\`\`\`
 
 ## Project Structure
 
 \`\`\`
-agents/              # Agent definitions
-\u251C\u2500\u2500 scheduler.ts     # Example agent
-\u2514\u2500\u2500 index.ts         # Re-exports all agents
+agents/              # Agent definitions (synced to Convex)
+\u251C\u2500\u2500 my-agent.ts      # One file per agent
+\u2514\u2500\u2500 index.ts         # Re-exports (optional)
 
-entity-types/        # Entity type schemas
-\u251C\u2500\u2500 teacher.ts       # Example entity type
-\u2514\u2500\u2500 index.ts         # Re-exports all entity types
+entity-types/        # Data schemas (like DB tables)
+\u251C\u2500\u2500 customer.ts      # Defines shape of "customer" entities
+\u2514\u2500\u2500 index.ts
 
-roles/               # Role + permission definitions
-\u251C\u2500\u2500 admin.ts         # Example role with policies
-\u2514\u2500\u2500 index.ts         # Re-exports all roles
+roles/               # RBAC: who can do what
+\u251C\u2500\u2500 admin.ts         # Full access
+\u251C\u2500\u2500 support.ts       # Limited access
+\u2514\u2500\u2500 index.ts
 
-tools/               # Shared custom tools
-\u2514\u2500\u2500 index.ts         # Custom tool definitions
+tools/               # Custom tools shared by all agents
+\u2514\u2500\u2500 index.ts         # defineTools([...])
 
-struere.json         # Organization configuration
-struere.config.ts    # Framework settings
+struere.json         # Organization ID (don't edit)
+struere.config.ts    # Local dev settings (port, CORS)
 \`\`\`
 
-## CLI Commands
+## Configuration Files
 
-| Command | Description |
-|---------|-------------|
-| \`struere dev\` | Watch and sync all resources to Convex |
-| \`struere deploy\` | Deploy all agents to production |
-| \`struere add <type> <name>\` | Scaffold new agent/entity-type/role |
-| \`struere status\` | Compare local vs remote state |
+### struere.json (auto-generated, don't edit)
+Links this project to your Convex organization:
+\`\`\`json
+{
+  "version": "2.0",
+  "organization": { "id": "org_xxx", "slug": "my-org", "name": "My Org" }
+}
+\`\`\`
+
+### struere.config.ts (optional local settings)
+\`\`\`typescript
+import { defineConfig } from 'struere'
+export default defineConfig({
+  port: 3000,           // Local dev server port
+  logging: { level: 'debug' }
+})
+\`\`\`
 
-## Defining Resources
+## CLI Commands
 
-### Agents (\`agents/*.ts\`)
+| Command | What it does |
+|---------|--------------|
+| \`struere dev\` | Watch files, sync to Convex on every save |
+| \`struere deploy\` | Copy dev config to production for all agents |
+| \`struere add agent <name>\` | Create agents/name.ts with template |
+| \`struere add entity-type <name>\` | Create entity-types/name.ts |
+| \`struere add role <name>\` | Create roles/name.ts |
+| \`struere status\` | Show what's synced vs local-only |
 
+## Defining Agents
+
+Create \`agents/support.ts\`:
 \`\`\`typescript
 import { defineAgent } from 'struere'
 
 export default defineAgent({
-  name: "Scheduler",
-  slug: "scheduler",
+  name: "Support Agent",
+  slug: "support",
   version: "0.1.0",
-  systemPrompt: "You are a scheduling assistant...",
-  model: { provider: "anthropic", name: "claude-sonnet-4-20250514" },
-  tools: ["entity.create", "entity.query", "event.emit"],
+  model: {
+    provider: "anthropic",  // or "openai", "google"
+    name: "claude-sonnet-4-20250514",
+    temperature: 0.7,
+    maxTokens: 4096,
+  },
+  systemPrompt: \\\`You are a support agent for {{organizationName}}.
+Current time: {{currentTime}}
+
+Available customers:
+{{#each entityTypes}}
+- {{this.name}}: {{this.description}}
+{{/each}}
+
+Use entity.query to look up customer info before responding.\\\`,
+  tools: [
+    "entity.query",
+    "entity.get",
+    "entity.update",
+    "event.emit",
+    "send_email",  // custom tool from tools/index.ts
+  ],
 })
 \`\`\`
 
-### Entity Types (\`entity-types/*.ts\`)
+### System Prompt Variables
+
+| Variable | Value |
+|----------|-------|
+| \`{{currentTime}}\` | ISO 8601 timestamp |
+| \`{{organizationName}}\` | Your org name |
+| \`{{agentName}}\` | This agent's name |
+| \`{{entityTypes}}\` | Array of all entity types (for #each loops) |
+| \`{{roles}}\` | Array of all roles |
 
+## Defining Entity Types
+
+Create \`entity-types/customer.ts\`:
 \`\`\`typescript
 import { defineEntityType } from 'struere'
 
 export default defineEntityType({
-  name: "Teacher",
-  slug: "teacher",
+  name: "Customer",
+  slug: "customer",
   schema: {
     type: "object",
     properties: {
       name: { type: "string" },
       email: { type: "string", format: "email" },
-      hourlyRate: { type: "number" },
+      plan: { type: "string", enum: ["free", "pro", "enterprise"] },
+      metadata: { type: "object" },
     },
     required: ["name", "email"],
   },
-  searchFields: ["name", "email"],
+  searchFields: ["name", "email"],  // Fields indexed for search
 })
 \`\`\`
 
-### Roles (\`roles/*.ts\`)
+Entities are stored as:
+\`\`\`json
+{
+  "_id": "ent_abc123",
+  "type": "customer",
+  "data": { "name": "John", "email": "john@example.com", "plan": "pro" },
+  "status": "active",
+  "createdAt": 1706745600000
+}
+\`\`\`
+
+## Defining Roles (RBAC)
 
+Create \`roles/support.ts\`:
 \`\`\`typescript
 import { defineRole } from 'struere'
 
 export default defineRole({
-  name: "teacher",
-  description: "Tutors who conduct sessions",
+  name: "support",
+  description: "Support staff with limited access",
+
+  // What actions are allowed/denied
   policies: [
-    { resource: "session", actions: ["list", "read", "update"], effect: "allow", priority: 50 },
+    { resource: "customer", actions: ["list", "read"], effect: "allow", priority: 50 },
+    { resource: "customer", actions: ["delete"], effect: "deny", priority: 100 },
     { resource: "payment", actions: ["*"], effect: "deny", priority: 100 },
   ],
+
+  // Row-level security: only see assigned customers
   scopeRules: [
-    { entityType: "session", field: "data.teacherId", operator: "eq", value: "actor.userId" },
+    {
+      entityType: "customer",
+      field: "data.assignedTo",  // Field in entity data
+      operator: "eq",
+      value: "actor.userId"      // Current user's ID
+    },
   ],
+
+  // Column-level security: hide sensitive fields
   fieldMasks: [
-    { entityType: "session", fieldPath: "data.paymentId", maskType: "hide" },
+    { entityType: "customer", fieldPath: "data.ssn", maskType: "hide" },
+    { entityType: "customer", fieldPath: "data.creditCard", maskType: "redact" },
   ],
 })
 \`\`\`
 
-## Built-in Tools
-
-| Tool | Description |
-|------|-------------|
-| \`entity.create\` | Create a new entity |
-| \`entity.get\` | Get entity by ID |
-| \`entity.query\` | Query entities by type/filters |
-| \`entity.update\` | Update entity data |
-| \`entity.delete\` | Soft-delete entity |
-| \`entity.link\` | Create entity relation |
-| \`entity.unlink\` | Remove entity relation |
-| \`event.emit\` | Emit custom event |
-| \`event.query\` | Query events |
-| \`job.enqueue\` | Schedule background job |
-| \`job.status\` | Get job status |
+### RBAC Enforcement
+
+Every tool call goes through permission checks:
+1. **Policy check**: Does this role allow the action on this resource?
+2. **Scope filter**: Query results filtered to rows user can access
+3. **Field mask**: Sensitive fields hidden/redacted in response
+
+Deny policies override allow. Higher priority wins.
+
+## Defining Custom Tools
+
+Edit \`tools/index.ts\`:
+\`\`\`typescript
+import { defineTools } from 'struere'
+
+export default defineTools([
+  {
+    name: "send_email",
+    description: "Send an email to a recipient",
+    parameters: {
+      type: "object",
+      properties: {
+        to: { type: "string", description: "Recipient email" },
+        subject: { type: "string", description: "Email subject" },
+        body: { type: "string", description: "Email body" },
+      },
+      required: ["to", "subject", "body"],
+    },
+    // Handler runs on Cloudflare Worker (sandboxed)
+    handler: async (args, context, fetch) => {
+      // context = { organizationId, actorId, actorType }
+      // fetch = sandboxed fetch (limited domains)
+
+      const response = await fetch("https://api.sendgrid.com/v3/mail/send", {
+        method: "POST",
+        headers: {
+          "Authorization": \\\`Bearer \\\${process.env.SENDGRID_API_KEY}\\\`,
+          "Content-Type": "application/json",
+        },
+        body: JSON.stringify({
+          personalizations: [{ to: [{ email: args.to }] }],
+          from: { email: "noreply@example.com" },
+          subject: args.subject,
+          content: [{ type: "text/plain", value: args.body }],
+        }),
+      })
+      return { success: response.ok, status: response.status }
+    },
+  },
+
+  {
+    name: "lookup_order",
+    description: "Look up order by ID",
+    parameters: {
+      type: "object",
+      properties: {
+        orderId: { type: "string", description: "Order ID" },
+      },
+      required: ["orderId"],
+    },
+    handler: async (args, context, fetch) => {
+      const res = await fetch(\\\`https://api.myshop.com/orders/\\\${args.orderId}\\\`, {
+        headers: { "X-Org-Id": context.organizationId },
+      })
+      return await res.json()
+    },
+  },
+])
+\`\`\`
+
+### Allowed Domains for Custom Tools
+
+Custom tool handlers can only fetch from:
+- api.openai.com, api.anthropic.com
+- api.stripe.com, api.sendgrid.com, api.twilio.com
+- hooks.slack.com, discord.com, api.github.com
+
+## Built-in Tools Reference
+
+### Entity Tools
+
+\`\`\`typescript
+// entity.create - Create new entity
+{ type: "customer", data: { name: "John", email: "j@example.com" }, status: "active" }
+
+// entity.get - Get by ID
+{ id: "ent_abc123" }
+
+// entity.query - Search/filter
+{ type: "customer", filters: { "data.plan": "pro" }, status: "active", limit: 50 }
+
+// entity.update - Partial update
+{ id: "ent_abc123", data: { plan: "enterprise" } }
+
+// entity.delete - Soft delete
+{ id: "ent_abc123" }
+
+// entity.link - Create relation
+{ fromEntityId: "ent_abc", toEntityId: "ent_xyz", relationType: "assigned_to" }
+
+// entity.unlink - Remove relation
+{ fromEntityId: "ent_abc", toEntityId: "ent_xyz", relationType: "assigned_to" }
+\`\`\`
+
+### Event Tools
+
+\`\`\`typescript
+// event.emit - Log an event
+{ eventType: "support.ticket.resolved", entityId: "ent_abc", payload: { rating: 5 } }
+
+// event.query - Query event history
+{ eventType: "support.ticket.*", entityId: "ent_abc", limit: 20 }
+\`\`\`
+
+Events are immutable audit logs. Use for analytics, debugging, compliance.
+
+### Job Tools
+
+\`\`\`typescript
+// job.enqueue - Schedule background work
+{
+  jobType: "send_reminder",
+  payload: { customerId: "ent_abc", message: "Your trial ends soon" },
+  runAt: 1706832000000  // Unix timestamp (optional, runs immediately if omitted)
+}
+
+// job.status - Check job status
+{ jobId: "job_xyz123" }
+// Returns: { status: "pending" | "running" | "completed" | "failed", result: {...} }
+\`\`\`
+
+Jobs run asynchronously with retry logic. Use for: emails, notifications, data sync.
+
+## Invoking Agents (API)
+
+### Chat Endpoint
+\`\`\`bash
+curl -X POST https://your-convex-url.convex.cloud/v1/chat \\
+  -H "Authorization: Bearer sk_live_xxx" \\
+  -H "Content-Type: application/json" \\
+  -d '{
+    "agentId": "agent_abc123",
+    "message": "What is the status of order #12345?",
+    "threadId": "thread_xyz",  // optional, creates new if omitted
+    "metadata": { "customerId": "ent_cust_789" }  // available in system prompt
+  }'
+\`\`\`
+
+### Response
+\`\`\`json
+{
+  "threadId": "thread_xyz",
+  "message": "Order #12345 is currently being shipped...",
+  "usage": { "inputTokens": 150, "outputTokens": 89 }
+}
+\`\`\`
+
+### By Slug (production)
+\`\`\`bash
+curl -X POST https://your-convex-url.convex.cloud/v1/agents/support/chat \\
+  -H "Authorization: Bearer sk_live_xxx" \\
+  -d '{"message": "Hello"}'
+\`\`\`
 
 ## Development Workflow
 
-1. Run \`struere dev\` to start watching for changes
-2. Edit agents, entity types, or roles
-3. Changes are automatically synced to Convex
-4. Test via API or dashboard
-5. Run \`struere deploy\` when ready for production
+1. \`struere dev\` - Start watching
+2. Edit files in agents/, entity-types/, roles/, tools/
+3. Save \u2192 auto-syncs to Convex (you'll see "Synced" message)
+4. Test via dashboard or curl
+5. \`struere deploy\` - Push to production
+
+## Common Patterns
+
+### Customer Support Agent
+\`\`\`typescript
+// agents/support.ts
+export default defineAgent({
+  name: "Support",
+  slug: "support",
+  version: "0.1.0",
+  systemPrompt: \\\`You help customers with their orders and account issues.
+
+When a customer asks about an order, use entity.query to find it first.
+Always be polite and helpful. If you can't help, offer to escalate.\\\`,
+  model: { provider: "anthropic", name: "claude-sonnet-4-20250514" },
+  tools: ["entity.query", "entity.get", "entity.update", "event.emit"],
+})
+\`\`\`
+
+### Scheduling Agent
+\`\`\`typescript
+// agents/scheduler.ts
+export default defineAgent({
+  name: "Scheduler",
+  slug: "scheduler",
+  version: "0.1.0",
+  systemPrompt: \\\`You help schedule appointments between teachers and students.
+
+Check teacher availability before booking. Create session entities for confirmed bookings.
+Send confirmation via the send_notification custom tool.\\\`,
+  model: { provider: "anthropic", name: "claude-sonnet-4-20250514" },
+  tools: ["entity.create", "entity.query", "job.enqueue", "send_notification"],
+})
+\`\`\`
+
+### Data Entry Agent
+\`\`\`typescript
+// agents/data-entry.ts
+export default defineAgent({
+  name: "Data Entry",
+  slug: "data-entry",
+  version: "0.1.0",
+  systemPrompt: \\\`You help users create and update records in the system.
+
+When creating entities, validate the data matches the schema.
+Always confirm what was created/updated.\\\`,
+  model: { provider: "anthropic", name: "claude-sonnet-4-20250514" },
+  tools: ["entity.create", "entity.update", "entity.query"],
+})
+\`\`\`
 `;
 }
 
@@ -1374,10 +1727,55 @@ var devCommand = new Command3("dev").description("Sync all resources to developm
     const message = error instanceof Error ? error.message : String(error);
     return message.includes("Unauthenticated") || message.includes("OIDC") || message.includes("token") || message.includes("expired");
   };
+  spinner.start("Checking remote state");
+  const { state: remoteState, error: stateError } = await getSyncState();
+  if (stateError) {
+    if (isAuthError(new Error(stateError))) {
+      spinner.fail("Session expired - re-authenticating...");
+      clearCredentials();
+      credentials = await performLogin();
+      if (!credentials) {
+        console.log(chalk3.red("Authentication failed"));
+        process.exit(1);
+      }
+    } else {
+      spinner.fail("Failed to fetch remote state");
+      console.log(chalk3.red("Error:"), stateError);
+      process.exit(1);
+    }
+  } else {
+    spinner.succeed("Remote state fetched");
+  }
+  if (remoteState?.installedPacks && remoteState.installedPacks.length > 0) {
+    console.log();
+    console.log(chalk3.cyan("Installed packs detected:"));
+    for (const pack of remoteState.installedPacks) {
+      console.log(chalk3.gray("  \u2022"), `${pack.packId} v${pack.version}`, chalk3.gray(`(${pack.entityTypeCount} types, ${pack.roleCount} roles)`));
+    }
+    console.log(chalk3.gray("  Pack resources will be preserved during sync."));
+    console.log();
+  }
+  if (remoteState?.agents && remoteState.agents.length > 0) {
+    const localResources = await loadAllResources(cwd);
+    const localSlugs = new Set(localResources.agents.map((a) => a.slug));
+    const unmanagedAgents = remoteState.agents.filter((a) => !localSlugs.has(a.slug));
+    if (unmanagedAgents.length > 0) {
+      console.log(chalk3.cyan("Existing agents not in local files:"));
+      for (const agent of unmanagedAgents) {
+        console.log(chalk3.gray("  \u2022"), agent.name, chalk3.gray(`(${agent.slug})`));
+      }
+      console.log(chalk3.gray("  These agents will be preserved during sync."));
+      console.log();
+    }
+  }
   const performSync = async () => {
     const resources = await loadAllResources(cwd);
     const payload = extractSyncPayload(resources);
-    const result = await syncOrganization(payload);
+    const result = await syncOrganization({
+      ...payload,
+      preservePackResources: true,
+      preserveUnmanagedAgents: true
+    });
     if (!result.success) {
       throw new Error(result.error || "Sync failed");
     }
@@ -1433,7 +1831,9 @@ var devCommand = new Command3("dev").description("Sync all resources to developm
   ].filter((p) => existsSync5(p));
   const watcher = chokidar.watch(watchPaths, {
     ignoreInitial: true,
-    ignored: /node_modules/
+    ignored: /node_modules/,
+    persistent: true,
+    usePolling: false
   });
   watcher.on("change", async (path) => {
     const relativePath = path.replace(cwd, ".");
@@ -1489,10 +1889,15 @@ var devCommand = new Command3("dev").description("Sync all resources to developm
       console.log(chalk3.red("Error:"), error instanceof Error ? error.message : String(error));
     }
   });
-  process.on("SIGINT", () => {
+  let isClosing = false;
+  process.on("SIGINT", async () => {
+    if (isClosing) {
+      process.exit(0);
+    }
+    isClosing = true;
     console.log();
-    watcher.close();
-    console.log(chalk3.gray("Stopped"));
+    console.log(chalk3.gray("Stopping..."));
+    await watcher.close();
     process.exit(0);
   });
 });
@@ -2470,7 +2875,7 @@ var statusCommand = new Command13("status").description("Compare local vs remote
 // package.json
 var package_default = {
   name: "struere",
-  version: "0.4.2",
+  version: "0.4.4",
   description: "Build, test, and deploy AI agents",
   keywords: [
     "ai",