@poncho-ai/harness 0.37.2 → 0.39.0

package/dist/index.js

@@ -2300,7 +2300,7 @@ var ponchoDocsTool = defineTool({
 import { randomUUID as randomUUID5 } from "crypto";
 import { readFile as readFile8 } from "fs/promises";
 import { resolve as resolve11 } from "path";
-import { defineTool as defineTool12, getTextContent as getTextContent2 } from "@poncho-ai/sdk";
+import { defineTool as defineTool12, getTextContent as getTextContent2, createLogger as createLogger5, formatError as fmtErr, url as urlColor } from "@poncho-ai/sdk";
 
 // src/upload-store.ts
 import { createHash as createHash2 } from "crypto";
@@ -2308,6 +2308,8 @@ import { mkdir as mkdir2, readFile as readFile4, writeFile as writeFile3, rm as
 import { createRequire } from "module";
 import { homedir as homedir2 } from "os";
 import { resolve as resolve5 } from "path";
+import { createLogger } from "@poncho-ai/sdk";
+var uploadLog = createLogger("upload");
 var tryImport = async (mod, workingDir) => {
   try {
     return await import(
@@ -2345,7 +2347,7 @@ var CachedUploadStore = class {
     this.cache.set(key, { data, ts: now2 });
     this.evict();
     this.inner.put(key, data, mediaType).catch((err) => {
-      console.error("[poncho] background upload failed:", err instanceof Error ? err.message : err);
+      uploadLog.error(`background upload failed: ${err instanceof Error ? err.message : err}`);
     });
     return ref;
   }
@@ -2559,7 +2561,7 @@ var S3UploadStore = class {
   }
 };
 var warn = (msg) => {
-  console.warn(`[poncho] \u26A0 ${msg}`);
+  uploadLog.warn(msg);
 };
 var createUploadStore = async (config, workingDir) => {
   const provider = config?.provider ?? "local";
@@ -2573,7 +2575,7 @@ var createUploadStore = async (config, workingDir) => {
     const store = new VercelBlobUploadStore(workingDir, config?.access ?? "public");
     try {
       await store.loadSdk();
-      console.log("[poncho] uploads: using vercel-blob store");
+      uploadLog.item("using vercel-blob store");
       return new CachedUploadStore(store);
     } catch {
       warn(
@@ -2599,7 +2601,7 @@ var createUploadStore = async (config, workingDir) => {
     );
     try {
       await store.ensureClient();
-      console.log(`[poncho] uploads: using s3 store (bucket: ${bucket})`);
+      uploadLog.item(`using s3 store (bucket: ${bucket})`);
       return new CachedUploadStore(store);
     } catch {
       warn(
@@ -2663,16 +2665,41 @@ var InMemoryEngine = class {
     get: async (conversationId) => {
       return this.convs.get(conversationId);
     },
-    create: async (ownerId, title, tenantId) => {
+    // In-memory storage has no separate archive blob, so both variants
+    // return the same conversation object.
+    getWithArchive: async (conversationId) => {
+      return this.convs.get(conversationId);
+    },
+    getStatusSnapshot: async (conversationId) => {
+      const c = this.convs.get(conversationId);
+      if (!c) return void 0;
+      return {
+        conversationId: c.conversationId,
+        updatedAt: c.updatedAt,
+        messageCount: c.messages.length,
+        hasPendingApprovals: Array.isArray(c.pendingApprovals) && c.pendingApprovals.length > 0,
+        hasContinuationMessages: Array.isArray(c._continuationMessages) && c._continuationMessages.length > 0,
+        parentConversationId: c.parentConversationId ?? null,
+        ownerId: c.ownerId,
+        tenantId: c.tenantId,
+        runStatus: c.runStatus ?? null
+      };
+    },
+    create: async (ownerId, title, tenantId, init) => {
       const now2 = Date.now();
       const conv = {
         conversationId: randomUUID3(),
         title: normalizeTitle(title),
-        messages: [],
+        messages: init?.messages ?? [],
         ownerId: ownerId ?? DEFAULT_OWNER,
         tenantId: tenantId === void 0 ? null : tenantId,
         createdAt: now2,
-        updatedAt: now2
+        updatedAt: now2,
+        ...init?.parentConversationId !== void 0 ? { parentConversationId: init.parentConversationId } : {},
+        ...init?.parentMessageId !== void 0 ? { parentMessageId: init.parentMessageId } : {},
+        ...init?.threadMeta !== void 0 ? { threadMeta: init.threadMeta } : {},
+        ...init?.subagentMeta !== void 0 ? { subagentMeta: init.subagentMeta } : {},
+        ...init?.channelMeta !== void 0 ? { channelMeta: init.channelMeta } : {}
       };
       this.convs.set(conv.conversationId, conv);
       return conv;
@@ -2720,6 +2747,16 @@ var InMemoryEngine = class {
       if (!conv) return void 0;
       conv.runningCallbackSince = void 0;
       return conv;
+    },
+    listThreads: async (parentConversationId) => {
+      const results = [];
+      for (const c of this.convs.values()) {
+        if (c.parentConversationId === parentConversationId && typeof c.parentMessageId === "string") {
+          results.push(this.toSummary(c));
+        }
+      }
+      results.sort((a, b) => b.updatedAt - a.updatedAt);
+      return results;
     }
   };
   // -----------------------------------------------------------------------
@@ -2776,11 +2813,21 @@ var InMemoryEngine = class {
         createdAt: Date.now(),
         conversationId: input.conversationId,
         ownerId: input.ownerId,
-        tenantId: input.tenantId
+        tenantId: input.tenantId,
+        recurrence: input.recurrence ?? null,
+        occurrenceCount: 0
       };
       this.reminderData.set(r.id, r);
       return r;
     },
+    update: async (id, fields) => {
+      const r = this.reminderData.get(id);
+      if (!r) throw new Error(`Reminder ${id} not found`);
+      if (fields.scheduledAt !== void 0) r.scheduledAt = fields.scheduledAt;
+      if (fields.occurrenceCount !== void 0) r.occurrenceCount = fields.occurrenceCount;
+      if (fields.status !== void 0) r.status = fields.status;
+      return r;
+    },
     cancel: async (id) => {
       const r = this.reminderData.get(id);
       if (!r) throw new Error(`Reminder ${id} not found`);
@@ -3013,6 +3060,7 @@ var InMemoryEngine = class {
       messageCount: c.messages.length,
       hasPendingApprovals: (c.pendingApprovals?.length ?? 0) > 0,
       parentConversationId: c.parentConversationId,
+      parentMessageId: c.parentMessageId,
       channelMeta: c.channelMeta
     };
   }
@@ -3057,6 +3105,7 @@ import { dirname as dirname2, resolve as resolve6 } from "path";
 
 // src/storage/sql-dialect.ts
 import { randomUUID as randomUUID4 } from "crypto";
+import { createLogger as createLogger2 } from "@poncho-ai/sdk";
 
 // src/storage/schema.ts
 var migrations = [
@@ -3207,10 +3256,32 @@ var migrations = [
         ]
       ];
     }
+  },
+  {
+    version: 5,
+    name: "add_reminder_recurrence",
+    up: (d) => {
+      const jsonType = d === "sqlite" ? "TEXT" : "JSONB";
+      return [
+        `ALTER TABLE reminders ADD COLUMN recurrence ${jsonType}`,
+        `ALTER TABLE reminders ADD COLUMN occurrence_count INTEGER NOT NULL DEFAULT 0`
+      ];
+    }
+  },
+  {
+    version: 6,
+    name: "add_thread_anchor",
+    up: () => [
+      `ALTER TABLE conversations ADD COLUMN parent_message_id TEXT`,
+      `CREATE INDEX IF NOT EXISTS idx_conversations_thread_anchor
+         ON conversations (parent_conversation_id, parent_message_id)
+         WHERE parent_message_id IS NOT NULL`
+    ]
   }
 ];
 
 // src/storage/sql-dialect.ts
+var egressLog = createLogger2("egress");
 var sqliteDialect = {
   tag: "sqlite",
   param: () => "?",
@@ -3241,9 +3312,68 @@ var rewrite = (sql, dialect) => {
   }
   return sql;
 };
+var ConversationEgressMeter = class {
+  read = {};
+  write = {};
+  lastLogAt = Date.now();
+  logIntervalMs;
+  enabled;
+  constructor(logIntervalMs = 6e4) {
+    this.logIntervalMs = logIntervalMs;
+    this.enabled = process.env.PONCHO_LOG_EGRESS === "1";
+  }
+  trackRead(method, bytes) {
+    const b = this.read[method] ??= { calls: 0, bytes: 0 };
+    b.calls += 1;
+    b.bytes += bytes;
+    this.maybeLog();
+  }
+  trackWrite(method, bytes) {
+    const b = this.write[method] ??= { calls: 0, bytes: 0 };
+    b.calls += 1;
+    b.bytes += bytes;
+    this.maybeLog();
+  }
+  maybeLog() {
+    if (!this.enabled) return;
+    const now2 = Date.now();
+    if (now2 - this.lastLogAt < this.logIntervalMs) return;
+    this.lastLogAt = now2;
+    this.flush();
+  }
+  flush() {
+    if (!this.enabled) return;
+    const fmt = (buckets) => Object.entries(buckets).filter(([, b]) => b.calls > 0).map(([m, b]) => `${m}=${b.calls}calls/${fmtBytes(b.bytes)}`).join(", ");
+    const r = fmt(this.read);
+    const w = fmt(this.write);
+    if (r || w) {
+      egressLog.debug(`read: ${r || "(none)"} | write: ${w || "(none)"}`);
+    }
+    for (const b of Object.values(this.read)) {
+      b.calls = 0;
+      b.bytes = 0;
+    }
+    for (const b of Object.values(this.write)) {
+      b.calls = 0;
+      b.bytes = 0;
+    }
+  }
+};
+var fmtBytes = (n) => {
+  if (n < 1024) return `${n}B`;
+  if (n < 1024 * 1024) return `${(n / 1024).toFixed(1)}KB`;
+  return `${(n / (1024 * 1024)).toFixed(2)}MB`;
+};
+var colBytes = (v) => {
+  if (v == null) return 0;
+  if (typeof v === "string") return v.length;
+  if (Buffer.isBuffer(v)) return v.byteLength;
+  return JSON.stringify(v).length;
+};
 var SqlStorageEngine = class {
   dialect;
   agentId;
+  egressMeter = new ConversationEgressMeter();
   constructor(dialect, agentId) {
     this.dialect = dialect;
     this.agentId = agentId;
@@ -3255,6 +3385,10 @@ var SqlStorageEngine = class {
     await this.onBeforeInit();
     await this.runMigrations();
   }
+  /** Flush egress stats before shutdown. Subclasses should call super. */
+  flushEgressStats() {
+    this.egressMeter.flush();
+  }
   /** Hook for subclass-specific setup (e.g. WAL mode). */
   async onBeforeInit() {
   }
@@ -3305,7 +3439,7 @@ var SqlStorageEngine = class {
       const filterTenant = tenantId !== void 0;
       const params = [this.agentId];
       let sql = `SELECT id, title, updated_at, created_at, owner_id, tenant_id,
-                        message_count, parent_conversation_id,
+                        message_count, parent_conversation_id, parent_message_id,
                         has_pending_approvals, channel_meta
                  FROM conversations WHERE agent_id = $1`;
       if (filterTenant) {
@@ -3321,11 +3455,62 @@ var SqlStorageEngine = class {
       return rows.map((r) => this.rowToSummary(r));
     },
     get: async (conversationId) => {
+      const row = await this.executor.get(
+        rewrite("SELECT data, harness_messages, continuation_messages FROM conversations WHERE id = $1 AND agent_id = $2", this.dialect),
+        [conversationId, this.agentId]
+      );
+      if (!row) return void 0;
+      this.egressMeter.trackRead(
+        "get",
+        colBytes(row.data) + colBytes(row.harness_messages) + colBytes(row.continuation_messages)
+      );
+      const conv = this.parseConversation(row.data);
+      if (row.harness_messages) {
+        conv._harnessMessages = typeof row.harness_messages === "string" ? JSON.parse(row.harness_messages) : row.harness_messages;
+      }
+      if (row.continuation_messages) {
+        conv._continuationMessages = typeof row.continuation_messages === "string" ? JSON.parse(row.continuation_messages) : row.continuation_messages;
+      }
+      return conv;
+    },
+    getStatusSnapshot: async (conversationId) => {
+      const runStatusExpr = this.dialect.tag === "sqlite" ? "json_extract(data, '$.runStatus')" : "data->>'runStatus'";
+      const row = await this.executor.get(
+        rewrite(
+          `SELECT updated_at, message_count, has_pending_approvals,
+                  parent_conversation_id, owner_id, tenant_id,
+                  (continuation_messages IS NOT NULL) AS has_continuation_messages,
+                  ${runStatusExpr} AS run_status
+           FROM conversations WHERE id = $1 AND agent_id = $2`,
+          this.dialect
+        ),
+        [conversationId, this.agentId]
+      );
+      if (!row) return void 0;
+      this.egressMeter.trackRead("getStatusSnapshot", 200);
+      const runStatus = row.run_status === "running" || row.run_status === "idle" ? row.run_status : null;
+      return {
+        conversationId,
+        updatedAt: new Date(row.updated_at).getTime(),
+        messageCount: row.message_count ?? 0,
+        hasPendingApprovals: !!row.has_pending_approvals,
+        hasContinuationMessages: !!row.has_continuation_messages,
+        parentConversationId: row.parent_conversation_id,
+        ownerId: row.owner_id,
+        tenantId: row.tenant_id === "__default__" ? null : row.tenant_id,
+        runStatus
+      };
+    },
+    getWithArchive: async (conversationId) => {
       const row = await this.executor.get(
         rewrite("SELECT data, tool_result_archive, harness_messages, continuation_messages FROM conversations WHERE id = $1 AND agent_id = $2", this.dialect),
         [conversationId, this.agentId]
       );
       if (!row) return void 0;
+      this.egressMeter.trackRead(
+        "getWithArchive",
+        colBytes(row.data) + colBytes(row.tool_result_archive) + colBytes(row.harness_messages) + colBytes(row.continuation_messages)
+      );
       const conv = this.parseConversation(row.data);
       if (row.tool_result_archive) {
         conv._toolResultArchive = typeof row.tool_result_archive === "string" ? JSON.parse(row.tool_result_archive) : row.tool_result_archive;
@@ -3338,24 +3523,30 @@ var SqlStorageEngine = class {
       }
       return conv;
     },
-    create: async (ownerId, title, tenantId) => {
+    create: async (ownerId, title, tenantId, init) => {
       const id = randomUUID4();
       const now2 = Date.now();
       const conv = {
         conversationId: id,
         title: normalizeTitle2(title),
-        messages: [],
+        messages: init?.messages ?? [],
         ownerId: ownerId ?? DEFAULT_OWNER2,
         tenantId: tenantId === void 0 ? null : tenantId,
         createdAt: now2,
-        updatedAt: now2
+        updatedAt: now2,
+        ...init?.parentConversationId !== void 0 ? { parentConversationId: init.parentConversationId } : {},
+        ...init?.parentMessageId !== void 0 ? { parentMessageId: init.parentMessageId } : {},
+        ...init?.subagentMeta !== void 0 ? { subagentMeta: init.subagentMeta } : {},
+        ...init?.threadMeta !== void 0 ? { threadMeta: init.threadMeta } : {},
+        ...init?.channelMeta !== void 0 ? { channelMeta: init.channelMeta } : {}
       };
       const data = JSON.stringify(conv);
+      const channelMetaJson = conv.channelMeta ? JSON.stringify(conv.channelMeta) : null;
       await this.executor.run(
         rewrite(
           `INSERT INTO conversations (id, agent_id, tenant_id, owner_id, title, data, message_count, created_at, updated_at,
-               parent_conversation_id, has_pending_approvals, channel_meta)
-           VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12)`,
+               parent_conversation_id, parent_message_id, has_pending_approvals, channel_meta)
+           VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13)`,
           this.dialect
         ),
         [
@@ -3365,12 +3556,13 @@ var SqlStorageEngine = class {
           conv.ownerId,
           conv.title,
           data,
-          0,
+          conv.messages.length,
           new Date(now2).toISOString(),
           new Date(now2).toISOString(),
-          null,
+          conv.parentConversationId ?? null,
+          conv.parentMessageId ?? null,
           0,
-          null
+          channelMetaJson
         ]
       );
       return conv;
@@ -3389,25 +3581,36 @@ var SqlStorageEngine = class {
       const archiveJson = archive ? JSON.stringify(archive) : null;
       const harnessJson = harnessMessages ? JSON.stringify(harnessMessages) : null;
       const continuationJson = continuationMessages ? JSON.stringify(continuationMessages) : null;
+      this.egressMeter.trackWrite(
+        "update",
+        data.length + (archiveJson?.length ?? 0) + (harnessJson?.length ?? 0) + (continuationJson?.length ?? 0)
+      );
       const msgCount = conversation.messages?.length ?? 0;
       const tid = normalizeTenant2(conversation.tenantId);
       const now2 = new Date(conversation.updatedAt).toISOString();
       const created = new Date(conversation.createdAt).toISOString();
       const parentConvId = conversation.parentConversationId ?? null;
+      const parentMsgId = conversation.parentMessageId ?? null;
       const hasPendingApprovals = (conversation.pendingApprovals?.length ?? 0) > 0 ? 1 : 0;
       const channelMetaJson = conversation.channelMeta ? JSON.stringify(conversation.channelMeta) : null;
       await this.executor.run(
         rewrite(
           `INSERT INTO conversations (id, agent_id, tenant_id, owner_id, title, data, message_count, created_at, updated_at,
                tool_result_archive, harness_messages, continuation_messages,
-               parent_conversation_id, has_pending_approvals, channel_meta)
-           VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15)
+               parent_conversation_id, parent_message_id, has_pending_approvals, channel_meta)
+           VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16)
            ${this.dialect.upsert(["id"])}
            data = excluded.data, title = excluded.title, message_count = excluded.message_count,
            updated_at = excluded.updated_at, tenant_id = excluded.tenant_id, owner_id = excluded.owner_id,
-           tool_result_archive = excluded.tool_result_archive, harness_messages = excluded.harness_messages,
+           -- tool_result_archive is append-only from the caller's side; if the
+           -- in-memory conversation was loaded via the light get() variant it
+           -- won't have _toolResultArchive attached, so we must preserve the
+           -- existing column instead of clobbering it with NULL.
+           tool_result_archive = COALESCE(excluded.tool_result_archive, conversations.tool_result_archive),
+           harness_messages = excluded.harness_messages,
            continuation_messages = excluded.continuation_messages,
            parent_conversation_id = excluded.parent_conversation_id,
+           parent_message_id = excluded.parent_message_id,
            has_pending_approvals = excluded.has_pending_approvals,
            channel_meta = excluded.channel_meta`,
           this.dialect
@@ -3426,6 +3629,7 @@ var SqlStorageEngine = class {
           harnessJson,
           continuationJson,
           parentConvId,
+          parentMsgId,
           hasPendingApprovals,
           channelMetaJson
         ]
@@ -3456,7 +3660,7 @@ var SqlStorageEngine = class {
       const pattern = `%${query}%`;
       const params = [this.agentId, pattern, pattern];
       let sql = `SELECT id, title, updated_at, created_at, owner_id, tenant_id,
-                        message_count, parent_conversation_id,
+                        message_count, parent_conversation_id, parent_message_id,
                         has_pending_approvals, channel_meta
                  FROM conversations
                  WHERE agent_id = $1 AND (title LIKE $2 OR data LIKE $3)`;
@@ -3480,6 +3684,21 @@ var SqlStorageEngine = class {
       conv.runningCallbackSince = void 0;
       await this.conversations.update(conv);
       return conv;
+    },
+    listThreads: async (parentConversationId) => {
+      const sql = `SELECT id, title, updated_at, created_at, owner_id, tenant_id,
+                          message_count, parent_conversation_id, parent_message_id,
+                          has_pending_approvals, channel_meta
+                   FROM conversations
+                   WHERE agent_id = $1
+                     AND parent_conversation_id = $2
+                     AND parent_message_id IS NOT NULL
+                   ORDER BY updated_at DESC`;
+      const rows = await this.executor.all(rewrite(sql, this.dialect), [
+        this.agentId,
+        parentConversationId
+      ]);
+      return rows.map((r) => this.rowToSummary(r));
     }
   };
   // -----------------------------------------------------------------------
@@ -3567,10 +3786,11 @@ var SqlStorageEngine = class {
       const id = randomUUID4();
       const now2 = Date.now();
       const tid = normalizeTenant2(input.tenantId);
+      const recurrenceJson = input.recurrence ? JSON.stringify(input.recurrence) : null;
       await this.executor.run(
         rewrite(
-          `INSERT INTO reminders (id, agent_id, tenant_id, owner_id, conversation_id, task, status, scheduled_at, timezone, created_at)
-           VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)`,
+          `INSERT INTO reminders (id, agent_id, tenant_id, owner_id, conversation_id, task, status, scheduled_at, timezone, created_at, recurrence, occurrence_count)
+           VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12)`,
           this.dialect
         ),
         [
@@ -3583,7 +3803,9 @@ var SqlStorageEngine = class {
           "pending",
           input.scheduledAt,
           input.timezone ?? null,
-          new Date(now2).toISOString()
+          new Date(now2).toISOString(),
+          recurrenceJson,
+          0
         ]
       );
       return {
@@ -3595,9 +3817,52 @@ var SqlStorageEngine = class {
         createdAt: now2,
         conversationId: input.conversationId,
         ownerId: input.ownerId,
-        tenantId: input.tenantId
+        tenantId: input.tenantId,
+        recurrence: input.recurrence ?? null,
+        occurrenceCount: 0
       };
     },
+    update: async (id, fields) => {
+      const setClauses = [];
+      const params = [];
+      let idx = 1;
+      if (fields.scheduledAt !== void 0) {
+        setClauses.push(`scheduled_at = $${idx++}`);
+        params.push(fields.scheduledAt);
+      }
+      if (fields.occurrenceCount !== void 0) {
+        setClauses.push(`occurrence_count = $${idx++}`);
+        params.push(fields.occurrenceCount);
+      }
+      if (fields.status !== void 0) {
+        setClauses.push(`status = $${idx++}`);
+        params.push(fields.status);
+      }
+      if (setClauses.length === 0) {
+        const row2 = await this.executor.get(
+          rewrite("SELECT * FROM reminders WHERE id = $1 AND agent_id = $2", this.dialect),
+          [id, this.agentId]
+        );
+        if (!row2) throw new Error(`Reminder ${id} not found`);
+        return this.rowToReminder(row2);
+      }
+      params.push(id, this.agentId);
+      const idIdx = idx++;
+      const agentIdx = idx++;
+      await this.executor.run(
+        rewrite(
+          `UPDATE reminders SET ${setClauses.join(", ")} WHERE id = $${idIdx} AND agent_id = $${agentIdx}`,
+          this.dialect
+        ),
+        params
+      );
+      const row = await this.executor.get(
+        rewrite("SELECT * FROM reminders WHERE id = $1 AND agent_id = $2", this.dialect),
+        [id, this.agentId]
+      );
+      if (!row) throw new Error(`Reminder ${id} not found`);
+      return this.rowToReminder(row);
+    },
     cancel: async (id) => {
       await this.executor.run(
         rewrite(
@@ -3899,11 +4164,20 @@ var SqlStorageEngine = class {
       messageCount: row.message_count,
       hasPendingApprovals: !!row.has_pending_approvals,
       parentConversationId: row.parent_conversation_id || void 0,
+      parentMessageId: row.parent_message_id || void 0,
       channelMeta: rawChannelMeta ? typeof rawChannelMeta === "string" ? JSON.parse(rawChannelMeta) : rawChannelMeta : void 0
     };
   }
   rowToReminder(row) {
     const tid = row.tenant_id;
+    let recurrence = null;
+    if (row.recurrence) {
+      try {
+        recurrence = typeof row.recurrence === "string" ? JSON.parse(row.recurrence) : row.recurrence;
+      } catch {
+        recurrence = null;
+      }
+    }
     return {
       id: row.id,
       task: row.task,
@@ -3913,7 +4187,9 @@ var SqlStorageEngine = class {
       createdAt: new Date(row.created_at).getTime(),
       conversationId: row.conversation_id,
       ownerId: row.owner_id ?? void 0,
-      tenantId: tid === DEFAULT_TENANT2 ? null : tid
+      tenantId: tid === DEFAULT_TENANT2 ? null : tid,
+      recurrence,
+      occurrenceCount: row.occurrence_count ?? 0
     };
   }
   toUint8Array(value) {
@@ -4019,6 +4295,7 @@ var SqliteEngine = class extends SqlStorageEngine {
     };
   }
   async close() {
+    this.flushEgressStats();
     this.db?.close();
   }
 };
@@ -4075,6 +4352,7 @@ var PostgresEngine = class extends SqlStorageEngine {
     this.patchVfs();
   }
   async close() {
+    this.flushEgressStats();
     await this.sql?.end();
   }
   /** Refresh the path cache for a tenant (call before bash.exec()). */
@@ -4170,12 +4448,15 @@ function createConversationStoreFromEngine(engine) {
     }),
     listSummaries: (ownerId, tenantId) => engine.conversations.list(ownerId, tenantId),
     get: (conversationId) => engine.conversations.get(conversationId),
-    create: (ownerId, title, tenantId) => engine.conversations.create(ownerId, title, tenantId),
+    getWithArchive: (conversationId) => engine.conversations.getWithArchive(conversationId),
+    getStatusSnapshot: (conversationId) => engine.conversations.getStatusSnapshot(conversationId),
+    create: (ownerId, title, tenantId, init) => engine.conversations.create(ownerId, title, tenantId, init),
     update: (conversation) => engine.conversations.update(conversation),
     rename: (conversationId, title) => engine.conversations.rename(conversationId, title),
     delete: (conversationId) => engine.conversations.delete(conversationId),
     appendSubagentResult: (conversationId, result) => engine.conversations.appendSubagentResult(conversationId, result),
-    clearCallbackLock: (conversationId) => engine.conversations.clearCallbackLock(conversationId)
+    clearCallbackLock: (conversationId) => engine.conversations.clearCallbackLock(conversationId),
+    listThreads: (parentConversationId) => engine.conversations.listThreads(parentConversationId)
   };
 }
 function createMemoryStoreFromEngine(engine, tenantId) {
@@ -4194,6 +4475,7 @@ function createReminderStoreFromEngine(engine) {
   return {
     list: () => engine.reminders.list(),
     create: (input) => engine.reminders.create(input),
+    update: (id, fields) => engine.reminders.update(id, fields),
     cancel: (id) => engine.reminders.cancel(id),
     delete: (id) => engine.reminders.delete(id)
   };
@@ -4591,13 +4873,23 @@ var BashEnvironmentManager = class {
     this.bashOptions = toBashOptions(bashConfig, network);
   }
   environments = /* @__PURE__ */ new Map();
+  filesystems = /* @__PURE__ */ new Map();
   workingDir;
   bashOptions;
+  /** Return the combined IFileSystem (VFS + optional /project mount) for a tenant. */
+  getFs(tenantId) {
+    let fs = this.filesystems.get(tenantId);
+    if (!fs) {
+      const adapter = new PonchoFsAdapter(this.engine, tenantId, this.limits);
+      fs = createBashFs(adapter, this.workingDir);
+      this.filesystems.set(tenantId, fs);
+    }
+    return fs;
+  }
   getOrCreate(tenantId) {
     let bash = this.environments.get(tenantId);
     if (!bash) {
-      const adapter = new PonchoFsAdapter(this.engine, tenantId, this.limits);
-      const fs = createBashFs(adapter, this.workingDir);
+      const fs = this.getFs(tenantId);
       bash = new Bash({
         fs,
         cwd: "/",
@@ -4621,9 +4913,11 @@ var BashEnvironmentManager = class {
   }
   destroy(tenantId) {
     this.environments.delete(tenantId);
+    this.filesystems.delete(tenantId);
   }
   destroyAll() {
     this.environments.clear();
+    this.filesystems.clear();
   }
 };
 
@@ -4701,7 +4995,7 @@ var mimeFromPath = (path) => {
   return MIME_MAP2[path.slice(dot).toLowerCase()];
 };
 var isTextMime = (mime) => mime.startsWith("text/") || mime === "application/json" || mime === "application/xml" || mime === "application/sql" || mime === "application/javascript" || mime === "application/x-sh";
-var createReadFileTool = (engine) => defineTool3({
+var createReadFileTool = (getFs) => defineTool3({
   name: "read_file",
   description: "Read a file from the virtual filesystem. Returns text content for text-based files, or sends images and PDFs directly to the model for visual analysis.",
   inputSchema: {
@@ -4721,23 +5015,24 @@ var createReadFileTool = (engine) => defineTool3({
       throw new Error("path is required");
     }
     const tenantId = context.tenantId ?? "__default__";
-    const stat3 = await engine.vfs.stat(tenantId, filePath);
-    if (!stat3) {
+    const fs = getFs(tenantId);
+    if (!await fs.exists(filePath)) {
       throw new Error(`File not found: ${filePath}`);
     }
-    if (stat3.type === "directory") {
+    const stat3 = await fs.stat(filePath);
+    if (stat3.isDirectory) {
       throw new Error(`${filePath} is a directory, not a file`);
     }
-    const mediaType = stat3.mimeType ?? mimeFromPath(filePath) ?? "application/octet-stream";
+    const mediaType = mimeFromPath(filePath) ?? "application/octet-stream";
     const filename = filePath.split("/").pop() ?? filePath;
     if (isTextMime(mediaType)) {
-      const buf = await engine.vfs.readFile(tenantId, filePath);
-      const text = Buffer.from(buf).toString("utf8");
+      const text = await fs.readFile(filePath);
       return { filename, mediaType, content: text };
     }
+    const buf = await fs.readFileBuffer(filePath);
     return {
       type: "file",
-      data: `${VFS_SCHEME}${filePath}`,
+      data: Buffer.from(buf).toString("base64"),
       mediaType,
       filename
     };
@@ -4746,7 +5041,7 @@ var createReadFileTool = (engine) => defineTool3({
 
 // src/vfs/edit-file-tool.ts
 import { defineTool as defineTool4 } from "@poncho-ai/sdk";
-var createEditFileTool = (engine) => defineTool4({
+var createEditFileTool = (getFs) => defineTool4({
   name: "edit_file",
   description: "Edit a file by replacing an exact string match with new content. The old_str must match exactly one location in the file. Use an empty new_str to delete matched content. Use read_file first to see current content before editing.",
   inputSchema: {
@@ -4775,11 +5070,11 @@ var createEditFileTool = (engine) => defineTool4({
     if (!filePath) throw new Error("path is required");
     if (!oldStr) throw new Error("old_str must not be empty");
     const tenantId = context.tenantId ?? "__default__";
-    const stat3 = await engine.vfs.stat(tenantId, filePath);
-    if (!stat3) throw new Error(`File not found: ${filePath}`);
-    if (stat3.type === "directory") throw new Error(`${filePath} is a directory`);
-    const buf = await engine.vfs.readFile(tenantId, filePath);
-    const content = Buffer.from(buf).toString("utf8");
+    const fs = getFs(tenantId);
+    if (!await fs.exists(filePath)) throw new Error(`File not found: ${filePath}`);
+    const stat3 = await fs.stat(filePath);
+    if (stat3.isDirectory) throw new Error(`${filePath} is a directory`);
+    const content = await fs.readFile(filePath);
     const first = content.indexOf(oldStr);
     if (first === -1) {
       throw new Error(
@@ -4793,14 +5088,14 @@ var createEditFileTool = (engine) => defineTool4({
       );
     }
     const updated = content.slice(0, first) + newStr + content.slice(first + oldStr.length);
-    await engine.vfs.writeFile(tenantId, filePath, new TextEncoder().encode(updated));
+    await fs.writeFile(filePath, updated);
     return { ok: true, path: filePath };
   }
 });
 
 // src/vfs/write-file-tool.ts
 import { defineTool as defineTool5 } from "@poncho-ai/sdk";
-var createWriteFileTool = (engine) => defineTool5({
+var createWriteFileTool = (getFs) => defineTool5({
   name: "write_file",
   description: "Create a new file or overwrite an existing file in the virtual filesystem. Parent directories are created automatically. Prefer edit_file for targeted changes to existing files.",
   inputSchema: {
@@ -4823,11 +5118,12 @@ var createWriteFileTool = (engine) => defineTool5({
     const content = typeof input.content === "string" ? input.content : "";
     if (!filePath) throw new Error("path is required");
     const tenantId = context.tenantId ?? "__default__";
+    const fs = getFs(tenantId);
     const dir = filePath.slice(0, filePath.lastIndexOf("/"));
     if (dir) {
-      await engine.vfs.mkdir(tenantId, dir, true);
+      await fs.mkdir(dir, { recursive: true });
     }
-    await engine.vfs.writeFile(tenantId, filePath, new TextEncoder().encode(content));
+    await fs.writeFile(filePath, content);
     return { ok: true, path: filePath };
   }
 });
@@ -5370,10 +5666,11 @@ async function resolveEnv(secretsStore, tenantId, envName) {
 // src/reminder-tools.ts
 import { defineTool as defineTool8 } from "@poncho-ai/sdk";
 var VALID_STATUSES2 = ["pending", "cancelled"];
+var VALID_RECURRENCE_TYPES = ["daily", "weekly", "monthly", "cron"];
 var createReminderTools = (store) => [
   defineTool8({
     name: "set_reminder",
-    description: "Set a one-time reminder that will fire at the specified date and time. Use this when the user asks to be reminded about something. The datetime must be an ISO 8601 string in the future. When the reminder fires, the task message will be delivered to the user.",
+    description: "Set a reminder that will fire at the specified date and time. Use this when the user asks to be reminded about something. The datetime must be an ISO 8601 string in the future. When the reminder fires, the task message will be delivered to the user. Supports optional recurrence for recurring reminders (daily, weekly, monthly, or cron).",
     inputSchema: {
       type: "object",
       properties: {
@@ -5383,11 +5680,45 @@ var createReminderTools = (store) => [
         },
         datetime: {
           type: "string",
-          description: "ISO 8601 datetime for when the reminder should fire (e.g. '2026-03-23T09:00:00Z')"
+          description: "ISO 8601 datetime for when the reminder should first fire (e.g. '2026-03-23T09:00:00Z')"
         },
         timezone: {
           type: "string",
           description: "IANA timezone for interpreting the datetime if it lacks an offset (e.g. 'America/New_York'). Defaults to UTC."
+        },
+        recurrence: {
+          type: "object",
+          description: "Optional. Set this to make the reminder repeat. Omit for a one-time reminder.",
+          properties: {
+            type: {
+              type: "string",
+              enum: VALID_RECURRENCE_TYPES,
+              description: "How often to repeat: 'daily', 'weekly', 'monthly', or 'cron'."
+            },
+            interval: {
+              type: "number",
+              description: "Repeat every N units (e.g. 2 = every 2 days/weeks/months). Defaults to 1."
+            },
+            daysOfWeek: {
+              type: "array",
+              items: { type: "number" },
+              description: "For weekly: which days to fire (0=Sunday, 1=Monday, ..., 6=Saturday)."
+            },
+            expression: {
+              type: "string",
+              description: "For type 'cron': a 5-field cron expression (e.g. '0 9 * * 1-5' for weekdays at 9am)."
+            },
+            endsAt: {
+              type: "string",
+              description: "ISO 8601 datetime after which the recurrence should stop."
+            },
+            maxOccurrences: {
+              type: "number",
+              description: "Maximum number of times the reminder should fire before stopping."
+            }
+          },
+          required: ["type"],
+          additionalProperties: false
         }
       },
       required: ["task", "datetime"],
@@ -5434,13 +5765,56 @@ var createReminderTools = (store) => [
       if (scheduledAt <= Date.now()) {
         throw new Error("Reminder datetime must be in the future");
       }
+      let recurrence = null;
+      if (input.recurrence && typeof input.recurrence === "object") {
+        const rec = input.recurrence;
+        const recType = rec.type;
+        if (!VALID_RECURRENCE_TYPES.includes(recType)) {
+          throw new Error(`Invalid recurrence type: "${recType}". Must be one of: ${VALID_RECURRENCE_TYPES.join(", ")}`);
+        }
+        recurrence = { type: recType };
+        if (rec.interval !== void 0) {
+          const interval = Number(rec.interval);
+          if (!Number.isInteger(interval) || interval < 1) {
+            throw new Error("recurrence.interval must be a positive integer");
+          }
+          recurrence.interval = interval;
+        }
+        if (rec.daysOfWeek !== void 0) {
+          if (!Array.isArray(rec.daysOfWeek)) throw new Error("recurrence.daysOfWeek must be an array");
+          const days = rec.daysOfWeek.map(Number);
+          if (days.some((d) => !Number.isInteger(d) || d < 0 || d > 6)) {
+            throw new Error("recurrence.daysOfWeek values must be integers 0-6");
+          }
+          recurrence.daysOfWeek = days;
+        }
+        if (rec.expression !== void 0) {
+          if (typeof rec.expression !== "string") throw new Error("recurrence.expression must be a string");
+          recurrence.expression = rec.expression;
+        }
+        if (rec.endsAt !== void 0) {
+          const endsAtDate = new Date(rec.endsAt);
+          if (isNaN(endsAtDate.getTime())) {
+            throw new Error(`Invalid recurrence.endsAt: "${rec.endsAt}"`);
+          }
+          recurrence.endsAt = endsAtDate.getTime();
+        }
+        if (rec.maxOccurrences !== void 0) {
+          const max = Number(rec.maxOccurrences);
+          if (!Number.isInteger(max) || max < 1) {
+            throw new Error("recurrence.maxOccurrences must be a positive integer");
+          }
+          recurrence.maxOccurrences = max;
+        }
+      }
       const conversationId = context.conversationId || context.runId;
       const reminder = await store.create({
         task,
         scheduledAt,
         timezone,
         conversationId,
-        tenantId: context.tenantId
+        tenantId: context.tenantId,
+        recurrence
       });
       return {
         ok: true,
@@ -5449,14 +5823,16 @@ var createReminderTools = (store) => [
           task: reminder.task,
           scheduledAt: new Date(reminder.scheduledAt).toISOString(),
           timezone: reminder.timezone ?? "UTC",
-          status: reminder.status
+          status: reminder.status,
+          recurrence: reminder.recurrence ?? void 0,
+          occurrenceCount: reminder.occurrenceCount ?? 0
         }
       };
     }
   }),
   defineTool8({
     name: "list_reminders",
-    description: "List reminders for this agent. Returns all reminders by default; use the status filter to show only pending or cancelled ones. Fired reminders are automatically deleted after delivery.",
+    description: "List reminders for this agent. Returns all reminders by default; use the status filter to show only pending or cancelled ones. Fired one-time reminders are automatically deleted after delivery. Recurring reminders stay active and show their recurrence config and fire count.",
     inputSchema: {
       type: "object",
       properties: {
@@ -5484,7 +5860,9 @@ var createReminderTools = (store) => [
           scheduledAt: new Date(r.scheduledAt).toISOString(),
           timezone: r.timezone ?? "UTC",
           status: r.status,
-          createdAt: new Date(r.createdAt).toISOString()
+          createdAt: new Date(r.createdAt).toISOString(),
+          recurrence: r.recurrence ?? void 0,
+          occurrenceCount: r.occurrenceCount ?? 0
         })),
         count: reminders.length
       };
@@ -5492,7 +5870,7 @@ var createReminderTools = (store) => [
   }),
   defineTool8({
     name: "cancel_reminder",
-    description: "Cancel a pending reminder by its ID.",
+    description: "Cancel a pending reminder by its ID. This works for both one-time and recurring reminders \u2014 cancelling a recurring reminder stops all future occurrences.",
     inputSchema: {
       type: "object",
       properties: {
@@ -5529,6 +5907,8 @@ var createReminderTools = (store) => [
 ];
 
 // src/mcp.ts
+import { createLogger as createLogger3 } from "@poncho-ai/sdk";
+var mcpLog = createLogger3("mcp");
 var McpHttpError = class extends Error {
   status;
   constructor(status, message) {
@@ -5776,12 +6156,10 @@ var LocalMcpBridge = class {
     return server.name ?? server.url;
   }
   log(level, event, payload) {
-    const line = JSON.stringify({ event, ...payload });
-    if (level === "warn") {
-      console.warn(`[poncho][mcp] ${line}`);
-      return;
-    }
-    console.info(`[poncho][mcp] ${line}`);
+    const summary = Object.entries(payload).map(([k, v]) => `${k}=${typeof v === "string" ? v : JSON.stringify(v)}`).join(" ");
+    const msg = summary ? `${event} ${summary}` : event;
+    if (level === "warn") mcpLog.warn(msg);
+    else mcpLog.debug(msg);
   }
   /** Set of servers where discovery was deferred (no default token, has env resolver). */
   deferredDiscoveryServers = /* @__PURE__ */ new Set();
@@ -7450,6 +7828,9 @@ import { NodeTracerProvider, BatchSpanProcessor } from "@opentelemetry/sdk-trace
 import { OTLPTraceExporter } from "@opentelemetry/exporter-trace-otlp-http";
 
 // src/telemetry.ts
+import { createLogger as createLogger4 } from "@poncho-ai/sdk";
+var eventLog = createLogger4("event");
+var telemetryLog = createLogger4("telemetry");
 var MAX_FIELD_LENGTH = 200;
 var OMIT_FROM_LOG = /* @__PURE__ */ new Set(["continuationMessages", "_harnessMessages", "messages", "compactedHistory"]);
 function sanitizeEventForLog(event) {
@@ -7490,11 +7871,10 @@ var TelemetryEmitter = class {
     if (otlp) {
       await this.sendOtlp(event, otlp);
     }
-    if (event.type === "model:chunk") {
+    if (event.type === "model:chunk" || event.type === "browser:frame") {
       return;
     }
-    process.stdout.write(`[event] ${event.type} ${sanitizeEventForLog(event)}
-`);
+    eventLog.debug(`${event.type} ${sanitizeEventForLog(event)}`);
   }
   async sendOtlp(event, otlp) {
     try {
@@ -7526,8 +7906,8 @@ var TelemetryEmitter = class {
         })
       });
     } catch (err) {
-      console.warn(
-        `[poncho][telemetry] OTLP log delivery failed: ${err instanceof Error ? err.message : String(err)}`
+      telemetryLog.warn(
+        `OTLP log delivery failed: ${err instanceof Error ? err.message : String(err)}`
       );
     }
   }
@@ -7621,6 +8001,11 @@ var ToolDispatcher = class {
 };
 
 // src/harness.ts
+var harnessLog = createLogger5("harness");
+var telemetryLog2 = createLogger5("telemetry");
+var costLog = createLogger5("cost");
+var mcpLog2 = createLogger5("mcp");
+var modelLog = createLogger5("model");
 function formatOtlpError(err) {
   if (!(err instanceof Error)) return String(err);
   const parts = [];
@@ -8228,8 +8613,8 @@ var AgentHarness = class _AgentHarness {
         const toolResultId = typeof input.toolResultId === "string" ? input.toolResultId : "";
         const record = archive[toolResultId];
         if (!record) {
-          console.info(
-            `[poncho][cost] Archived tool result lookup miss: id="${toolResultId}" conversation="${conversationId}"`
+          costLog.debug(
+            `archived tool result miss: id="${toolResultId}" conv=${conversationId.slice(0, 8)}`
           );
           return {
             error: `No archived tool result found for id "${toolResultId}" in this conversation.`
@@ -8239,8 +8624,8 @@ var AgentHarness = class _AgentHarness {
         const limit = Math.min(Math.max(Number(input.limit) || 6e3, 1), 2e4);
         const end = Math.min(record.payload.length, offset + limit);
         const chunk = record.payload.slice(offset, end);
-        console.info(
-          `[poncho][cost] Archived tool result lookup hit: id="${toolResultId}" conversation="${conversationId}" offset=${offset} returned=${chunk.length} total=${record.payload.length}`
+        costLog.debug(
+          `archived tool result hit: id="${toolResultId}" conv=${conversationId.slice(0, 8)} offset=${offset} returned=${chunk.length} total=${record.payload.length}`
         );
         return {
           toolResultId: record.toolResultId,
@@ -8612,9 +8997,7 @@ var AgentHarness = class _AgentHarness {
     this.dispatcher.unregisterMany(this.registeredMcpToolNames);
     this.registeredMcpToolNames.clear();
     if (requestedPatterns.length === 0) {
-      console.info(
-        `[poncho][mcp] ${JSON.stringify({ event: "tools.cleared", reason, requestedPatterns })}`
-      );
+      mcpLog2.debug(`tools cleared (reason=${reason})`);
       return;
     }
     const tools = await this.mcpBridge.loadTools(requestedPatterns);
@@ -8622,14 +9005,8 @@ var AgentHarness = class _AgentHarness {
     for (const tool of tools) {
       this.registeredMcpToolNames.add(tool.name);
     }
-    console.info(
-      `[poncho][mcp] ${JSON.stringify({
-        event: "tools.refreshed",
-        reason,
-        requestedPatterns,
-        registeredCount: tools.length,
-        activeSkills: this.listActiveSkills()
-      })}`
+    mcpLog2.debug(
+      `tools refreshed (reason=${reason}, registered=${tools.length}, patterns=${requestedPatterns.length})`
     );
   }
   buildSkillFingerprint(skills) {
@@ -8692,9 +9069,7 @@ var AgentHarness = class _AgentHarness {
       this.agentFileFingerprint = rawContent;
       return true;
     } catch (error) {
-      console.warn(
-        `[poncho][agent] Failed to refresh AGENT.md in development mode: ${error instanceof Error ? error.message : String(error)}`
-      );
+      createLogger5("agent").warn(`failed to refresh AGENT.md in dev: ${fmtErr(error)}`);
       return false;
     }
   }
@@ -8742,9 +9117,7 @@ var AgentHarness = class _AgentHarness {
       await this.refreshMcpTools("skills:changed");
       return true;
     } catch (error) {
-      console.warn(
-        `[poncho][skills] Failed to refresh skills in development mode: ${error instanceof Error ? error.message : String(error)}`
-      );
+      createLogger5("skills").warn(`failed to refresh skills in dev: ${fmtErr(error)}`);
       return false;
     }
   }
@@ -8794,9 +9167,10 @@ var AgentHarness = class _AgentHarness {
       config?.network
     );
     this.registerIfMissing(createBashTool(this.bashManager));
-    this.registerIfMissing(createReadFileTool(engine));
-    this.registerIfMissing(createEditFileTool(engine));
-    this.registerIfMissing(createWriteFileTool(engine));
+    const getFs = (tenantId) => this.bashManager.getFs(tenantId);
+    this.registerIfMissing(createReadFileTool(getFs));
+    this.registerIfMissing(createEditFileTool(getFs));
+    this.registerIfMissing(createWriteFileTool(getFs));
     if (config?.isolate) {
       const { createRunCodeTool, buildRunCodeDescription, bundleLibraries } = await import("./isolate-TCWTUVG4.js");
       let libraryPreamble = null;
@@ -8838,9 +9212,7 @@ var AgentHarness = class _AgentHarness {
     }
     if (config?.browser) {
       await this.initBrowserTools(config).catch((e) => {
-        console.warn(
-          `[poncho][browser] Failed to load browser tools: ${e instanceof Error ? e.message : String(e)}`
-        );
+        createLogger5("browser").warn(`failed to load browser tools: ${fmtErr(e)}`);
       });
     }
     const stateConfig = resolveStateConfig(config);
@@ -8871,7 +9243,7 @@ var AgentHarness = class _AgentHarness {
       provider2.register();
       this.otlpTracerProvider = provider2;
       this.hasOtlpExporter = true;
-      console.info(`[poncho][telemetry] OTLP trace exporter active \u2192 ${otlpConfig.url}`);
+      telemetryLog2.item(`OTLP trace exporter active \u2192 ${urlColor(otlpConfig.url)}`);
     }
   }
   async buildBrowserStoragePersistence(config, sessionId) {
@@ -8986,13 +9358,13 @@ var AgentHarness = class _AgentHarness {
     await this.mcpBridge?.stopLocalServers();
     if (this.otlpSpanProcessor) {
       await this.otlpSpanProcessor.shutdown().catch((err) => {
-        console.warn(`[poncho][telemetry] OTLP span processor shutdown error: ${formatOtlpError(err)}`);
+        telemetryLog2.warn(`OTLP span processor shutdown error: ${formatOtlpError(err)}`);
       });
       this.otlpSpanProcessor = void 0;
     }
     if (this.otlpTracerProvider) {
       await this.otlpTracerProvider.shutdown().catch((err) => {
-        console.warn(`[poncho][telemetry] OTLP tracer provider shutdown error: ${formatOtlpError(err)}`);
+        telemetryLog2.warn(`OTLP tracer provider shutdown error: ${formatOtlpError(err)}`);
       });
       this.otlpTracerProvider = void 0;
     }
@@ -9044,7 +9416,7 @@ var AgentHarness = class _AgentHarness {
           await this.otlpSpanProcessor?.forceFlush();
         } catch (err) {
           const detail = formatOtlpError(err);
-          console.warn(`[poncho][telemetry] OTLP span flush failed: ${detail}`);
+          telemetryLog2.warn(`OTLP span flush failed: ${detail}`);
         }
       }
     } else {
@@ -9090,19 +9462,15 @@ var AgentHarness = class _AgentHarness {
     this.seedToolResultArchive(conversationId, input.parameters);
     const truncationSummary = this.truncateHistoricalToolResults(messages, conversationId);
     if (truncationSummary.changed) {
-      console.info(
-        `[poncho][cost] Truncated ${truncationSummary.truncatedCount} historical tool result(s) (archived_new=${truncationSummary.archivedCount}, omitted_chars=${truncationSummary.omittedChars}) for conversation="${conversationId}"`
+      costLog.debug(
+        `truncated ${truncationSummary.truncatedCount} historical tool result(s) (archived=${truncationSummary.archivedCount}, omitted=${truncationSummary.omittedChars} chars) conv=${conversationId.slice(0, 8)}`
       );
     }
     const hasFullToolResults = hasUntruncatedToolResults(messages);
     if (hasFullToolResults) {
-      console.info(
-        `[poncho][cost] Prompt cache breakpoint will be placed before untruncated tool results for run "${runId}" (stable prefix only).`
-      );
+      costLog.debug(`cache breakpoint before untruncated tool results (run=${runId.slice(0, 12)})`);
     } else {
-      console.info(
-        `[poncho][cost] Prompt cache breakpoint will be placed at history tail for run "${runId}" (no untruncated tool results).`
-      );
+      costLog.debug(`cache breakpoint at history tail (run=${runId.slice(0, 12)})`);
     }
     const inputMessageCount = messages.length;
     const events = [];
@@ -9590,7 +9958,7 @@ ${textContent}` };
         };
         const modelName = agent.frontmatter.model?.name ?? "claude-opus-4-5";
         if (step === 1) {
-          console.info(`[poncho] model="${modelName}" provider="${agent.frontmatter.model?.provider ?? "anthropic"}"`);
+          modelLog.item(`${modelName} (provider=${agent.frontmatter.model?.provider ?? "anthropic"})`);
         }
         const modelInstance = this.modelProvider(modelName);
         const compactionConfig = resolveCompactionConfig(agent.frontmatter.compaction);
@@ -9688,8 +10056,8 @@ ${textContent}` };
                     message: `Model "${modelName}" did not respond within the ${Math.floor(timeoutMs / 1e3)}s run timeout.`
                   }
                 });
-                console.error(
-                  `[poncho][harness] Stream timeout: model="${modelName}", step=${step}, elapsed=${now() - start}ms`
+                harnessLog.error(
+                  `stream timeout: model=${modelName} step=${step} elapsed=${now() - start}ms`
                 );
                 return;
               }
@@ -9722,8 +10090,8 @@ ${textContent}` };
                 break;
               }
               const isFirstChunk = chunkCount === 0;
-              console.error(
-                `[poncho][harness] Stream timeout waiting for ${isFirstChunk ? "first" : "next"} chunk: model="${modelName}", step=${step}, chunks=${chunkCount}, elapsed=${now() - start}ms`
+              harnessLog.error(
+                `stream timeout waiting for ${isFirstChunk ? "first" : "next"} chunk: model=${modelName} step=${step} chunks=${chunkCount} elapsed=${now() - start}ms`
               );
               if (isFirstChunk) {
                 throw new FirstChunkTimeoutError(modelName, FIRST_CHUNK_TIMEOUT_MS);
@@ -9778,7 +10146,7 @@ ${textContent}` };
             contextTokens: latestContextTokens + toolOutputEstimateSinceModel,
             contextWindow
           };
-          console.info(`[poncho][harness] Soft deadline fired mid-stream at step ${step} (${(now() - start).toFixed(0)}ms). Checkpointing with ${fullText.length} chars of partial text.`);
+          harnessLog.info(`soft deadline fired mid-stream at step ${step} (${(now() - start).toFixed(0)}ms); checkpointing with ${fullText.length} chars of partial text`);
           yield pushEvent({ type: "run:completed", runId, result: result_ });
           return;
         }
@@ -9824,9 +10192,7 @@ ${textContent}` };
               message: `Model "${modelName}" returned an error. This may indicate the model is not supported by the current provider SDK version, or the API returned an error response.`
             }
           });
-          console.error(
-            `[poncho][harness] Model error: finishReason="error", model="${modelName}", step=${step}`
-          );
+          harnessLog.error(`model error: finishReason="error" model=${modelName} step=${step}`);
           return;
         }
         if (finishReason === "content-filter") {
@@ -9862,8 +10228,8 @@ ${textContent}` };
             cacheWrite: stepCacheWriteTokens
           }
         });
-        console.info(
-          `[poncho][cost] model="${modelName}" step=${step} input=${stepInputTokens} output=${usage.outputTokens ?? 0} cached=${stepCachedTokens} cacheWrite=${stepCacheWriteTokens} totals(input=${totalInputTokens}, output=${totalOutputTokens}, cached=${totalCachedTokens}, cacheWrite=${totalCacheWriteTokens})`
+        costLog.debug(
+          `step=${step} in=${stepInputTokens} out=${usage.outputTokens ?? 0} cached=${stepCachedTokens} cw=${stepCacheWriteTokens} totals(in=${totalInputTokens} out=${totalOutputTokens} cached=${totalCachedTokens} cw=${totalCacheWriteTokens})`
         );
         const toolCalls = toolCallsResult.map((tc) => ({
           id: tc.toolCallId,
@@ -9882,14 +10248,10 @@ ${textContent}` };
                   message: `Model "${modelName}" returned no content (finish reason: ${finishReason}). The model may not be supported by the current provider SDK version.`
                 }
               });
-              console.error(
-                `[poncho][harness] Empty response: finishReason="${finishReason}", model="${modelName}", step=${step}`
-              );
+              harnessLog.error(`empty response: finishReason="${finishReason}" model=${modelName} step=${step}`);
               return;
             }
-            console.warn(
-              `[poncho][harness] Model "${modelName}" returned an empty response with finishReason="stop" on step ${step}.`
-            );
+            harnessLog.warn(`model "${modelName}" returned empty response with finishReason="stop" on step ${step}`);
           }
           if (fullText.length > 0) {
             messages.push({
@@ -10255,8 +10617,8 @@ ${this.skillFingerprint}`;
         if (isRetryableModelError(error) && transientStepRetryCount < MAX_TRANSIENT_STEP_RETRIES) {
           transientStepRetryCount += 1;
           const statusCode = getErrorStatusCode(error);
-          console.warn(
-            `[poncho][harness] Retrying step ${step} after transient model error (attempt ${transientStepRetryCount}/${MAX_TRANSIENT_STEP_RETRIES})${typeof statusCode === "number" ? ` status=${statusCode}` : ""}: ${error instanceof Error ? error.message : String(error)}`
+          harnessLog.warn(
+            `retrying step ${step} after transient model error (attempt ${transientStepRetryCount}/${MAX_TRANSIENT_STEP_RETRIES})${typeof statusCode === "number" ? ` status=${statusCode}` : ""}: ${fmtErr(error)}`
           );
           step -= 1;
           continue;
@@ -10267,7 +10629,7 @@ ${this.skillFingerprint}`;
           runId,
           error: runError
         });
-        console.error(`[poncho][harness] Step ${step} error:`, error);
+        harnessLog.error(`step ${step} error: ${fmtErr(error)}`);
         return;
       }
     }
@@ -10431,12 +10793,22 @@ var InMemoryReminderStore = class {
       createdAt: Date.now(),
       conversationId: input.conversationId,
       ownerId: input.ownerId,
-      tenantId: input.tenantId
+      tenantId: input.tenantId,
+      recurrence: input.recurrence ?? null,
+      occurrenceCount: 0
     };
     this.reminders = pruneStale(this.reminders);
     this.reminders.push(reminder);
     return reminder;
   }
+  async update(id, fields) {
+    const reminder = this.reminders.find((r) => r.id === id);
+    if (!reminder) throw new Error(`Reminder "${id}" not found`);
+    if (fields.scheduledAt !== void 0) reminder.scheduledAt = fields.scheduledAt;
+    if (fields.occurrenceCount !== void 0) reminder.occurrenceCount = fields.occurrenceCount;
+    if (fields.status !== void 0) reminder.status = fields.status;
+    return reminder;
+  }
   async cancel(id) {
     const reminder = this.reminders.find((r) => r.id === id);
     if (!reminder) throw new Error(`Reminder "${id}" not found`);
@@ -10450,6 +10822,101 @@ var InMemoryReminderStore = class {
     this.reminders = this.reminders.filter((r) => r.id !== id);
   }
 };
+var computeNextOccurrence = (reminder) => {
+  const rec = reminder.recurrence;
+  if (!rec) return null;
+  const fired = (reminder.occurrenceCount ?? 0) + 1;
+  if (rec.maxOccurrences && fired >= rec.maxOccurrences) return null;
+  const interval = rec.interval ?? 1;
+  const prev = reminder.scheduledAt;
+  let next;
+  switch (rec.type) {
+    case "daily": {
+      next = prev + interval * 24 * 60 * 60 * 1e3;
+      break;
+    }
+    case "weekly": {
+      if (rec.daysOfWeek && rec.daysOfWeek.length > 0) {
+        const d = new Date(prev);
+        const days = [...rec.daysOfWeek].sort((a, b) => a - b);
+        const currentDay = d.getUTCDay();
+        let nextDay = days.find((day) => day > currentDay);
+        if (nextDay !== void 0) {
+          const delta = nextDay - currentDay;
+          next = prev + delta * 24 * 60 * 60 * 1e3;
+        } else {
+          const delta = 7 * interval - currentDay + days[0];
+          next = prev + delta * 24 * 60 * 60 * 1e3;
+        }
+      } else {
+        next = prev + interval * 7 * 24 * 60 * 60 * 1e3;
+      }
+      break;
+    }
+    case "monthly": {
+      const d = new Date(prev);
+      d.setUTCMonth(d.getUTCMonth() + interval);
+      next = d.getTime();
+      break;
+    }
+    case "cron": {
+      if (!rec.expression) return null;
+      const parsed = parseCronExpression(rec.expression);
+      if (!parsed) return null;
+      next = nextCronOccurrence(prev, parsed);
+      if (next <= prev) return null;
+      break;
+    }
+    default:
+      return null;
+  }
+  if (rec.endsAt && next > rec.endsAt) return null;
+  return next;
+};
+var expandField = (field, min, max) => {
+  const values = /* @__PURE__ */ new Set();
+  for (const part of field.split(",")) {
+    const stepMatch = part.match(/^(.+)\/(\d+)$/);
+    const step = stepMatch ? parseInt(stepMatch[2], 10) : 1;
+    const range = stepMatch ? stepMatch[1] : part;
+    if (range === "*") {
+      for (let i = min; i <= max; i += step) values.add(i);
+    } else if (range.includes("-")) {
+      const [lo, hi] = range.split("-").map(Number);
+      if (isNaN(lo) || isNaN(hi)) return null;
+      for (let i = lo; i <= hi; i += step) values.add(i);
+    } else {
+      const n = parseInt(range, 10);
+      if (isNaN(n)) return null;
+      values.add(n);
+    }
+  }
+  return values;
+};
+var parseCronExpression = (expr) => {
+  const parts = expr.trim().split(/\s+/);
+  if (parts.length !== 5) return null;
+  const minutes = expandField(parts[0], 0, 59);
+  const hours = expandField(parts[1], 0, 23);
+  const daysOfMonth = expandField(parts[2], 1, 31);
+  const months = expandField(parts[3], 1, 12);
+  const daysOfWeek = expandField(parts[4], 0, 6);
+  if (!minutes || !hours || !daysOfMonth || !months || !daysOfWeek) return null;
+  return { minutes, hours, daysOfMonth, months, daysOfWeek };
+};
+var nextCronOccurrence = (afterMs, fields) => {
+  const d = new Date(afterMs);
+  d.setUTCSeconds(0, 0);
+  d.setUTCMinutes(d.getUTCMinutes() + 1);
+  const limit = afterMs + 366 * 24 * 60 * 60 * 1e3;
+  while (d.getTime() < limit) {
+    if (fields.months.has(d.getUTCMonth() + 1) && fields.daysOfMonth.has(d.getUTCDate()) && fields.daysOfWeek.has(d.getUTCDay()) && fields.hours.has(d.getUTCHours()) && fields.minutes.has(d.getUTCMinutes())) {
+      return d.getTime();
+    }
+    d.setUTCMinutes(d.getUTCMinutes() + 1);
+  }
+  return afterMs;
+};
 var createReminderStore = (_agentId, _config, _options) => {
   return new InMemoryReminderStore();
 };
@@ -10514,6 +10981,7 @@ var InMemoryConversationStore = class {
       ownerId: c.ownerId,
       tenantId: c.tenantId,
       parentConversationId: c.parentConversationId,
+      parentMessageId: c.parentMessageId,
       messageCount: c.messages.length,
       hasPendingApprovals: Array.isArray(c.pendingApprovals) && c.pendingApprovals.length > 0,
       channelMeta: c.channelMeta
@@ -10523,16 +10991,41 @@ var InMemoryConversationStore = class {
     this.purgeExpired();
     return this.conversations.get(conversationId);
   }
-  async create(ownerId = DEFAULT_OWNER3, title, tenantId = null) {
+  // In-memory stores already hold the full conversation object, so there's
+  // no separate archive blob to load. Both variants return the same data.
+  async getWithArchive(conversationId) {
+    return this.get(conversationId);
+  }
+  async getStatusSnapshot(conversationId) {
+    const c = await this.get(conversationId);
+    if (!c) return void 0;
+    return {
+      conversationId: c.conversationId,
+      updatedAt: c.updatedAt,
+      messageCount: c.messages.length,
+      hasPendingApprovals: Array.isArray(c.pendingApprovals) && c.pendingApprovals.length > 0,
+      hasContinuationMessages: Array.isArray(c._continuationMessages) && c._continuationMessages.length > 0,
+      parentConversationId: c.parentConversationId ?? null,
+      ownerId: c.ownerId,
+      tenantId: c.tenantId,
+      runStatus: c.runStatus ?? null
+    };
+  }
+  async create(ownerId = DEFAULT_OWNER3, title, tenantId = null, init) {
     const now2 = Date.now();
     const conversation = {
       conversationId: globalThis.crypto?.randomUUID?.() ?? `${now2}-${Math.random()}`,
       title: normalizeTitle3(title),
-      messages: [],
+      messages: init?.messages ?? [],
       ownerId,
       tenantId,
       createdAt: now2,
-      updatedAt: now2
+      updatedAt: now2,
+      ...init?.parentConversationId !== void 0 ? { parentConversationId: init.parentConversationId } : {},
+      ...init?.parentMessageId !== void 0 ? { parentMessageId: init.parentMessageId } : {},
+      ...init?.threadMeta !== void 0 ? { threadMeta: init.threadMeta } : {},
+      ...init?.subagentMeta !== void 0 ? { subagentMeta: init.subagentMeta } : {},
+      ...init?.channelMeta !== void 0 ? { channelMeta: init.channelMeta } : {}
     };
     this.conversations.set(conversation.conversationId, conversation);
     return conversation;
@@ -10571,6 +11064,24 @@ var InMemoryConversationStore = class {
     conversation.updatedAt = Date.now();
     return conversation;
   }
+  async listThreads(parentConversationId) {
+    this.purgeExpired();
+    return Array.from(this.conversations.values()).filter(
+      (c) => c.parentConversationId === parentConversationId && typeof c.parentMessageId === "string"
+    ).sort((a, b) => b.updatedAt - a.updatedAt).map((c) => ({
+      conversationId: c.conversationId,
+      title: c.title,
+      updatedAt: c.updatedAt,
+      createdAt: c.createdAt,
+      ownerId: c.ownerId,
+      tenantId: c.tenantId,
+      parentConversationId: c.parentConversationId,
+      parentMessageId: c.parentMessageId,
+      messageCount: c.messages.length,
+      hasPendingApprovals: Array.isArray(c.pendingApprovals) && c.pendingApprovals.length > 0,
+      channelMeta: c.channelMeta
+    }));
+  }
 };
 var createStateStore = (config, _options) => {
   const ttl = config?.ttl;
@@ -10607,31 +11118,1608 @@ function extractMetadata(payload) {
   return void 0;
 }
 
+// src/orchestrator/history.ts
+var isMessageArray = (value) => Array.isArray(value) && value.every((entry) => {
+  if (!entry || typeof entry !== "object") return false;
+  const row = entry;
+  const role = row.role;
+  const content = row.content;
+  const roleOk = role === "system" || role === "user" || role === "assistant" || role === "tool";
+  const contentOk = typeof content === "string" || Array.isArray(content);
+  return roleOk && contentOk;
+});
+var loadCanonicalHistory = (conversation) => {
+  if (isMessageArray(conversation._harnessMessages) && conversation._harnessMessages.length > 0) {
+    return { messages: [...conversation._harnessMessages], source: "harness" };
+  }
+  return { messages: [...conversation.messages], source: "messages" };
+};
+var loadRunHistory = (conversation, options) => {
+  if (options?.preferContinuation && isMessageArray(conversation._continuationMessages) && conversation._continuationMessages.length > 0) {
+    return {
+      messages: [...conversation._continuationMessages],
+      source: "continuation",
+      shouldRebuildCanonical: !isMessageArray(conversation._harnessMessages) || conversation._harnessMessages.length === 0
+    };
+  }
+  const canonical = loadCanonicalHistory(conversation);
+  return {
+    ...canonical,
+    shouldRebuildCanonical: canonical.source !== "harness"
+  };
+};
+var resolveRunRequest = (conversation, request) => {
+  const resolved = loadRunHistory(conversation, {
+    preferContinuation: request.preferContinuation
+  });
+  return {
+    source: resolved.source,
+    shouldRebuildCanonical: resolved.shouldRebuildCanonical,
+    messages: resolved.messages.length > 0 ? resolved.messages : request.messages
+  };
+};
+
+// src/orchestrator/turn.ts
+var createTurnDraftState = () => ({
+  assistantResponse: "",
+  toolTimeline: [],
+  sections: [],
+  currentTools: [],
+  currentText: ""
+});
+var cloneSections = (sections) => sections.map((section) => ({
+  type: section.type,
+  content: Array.isArray(section.content) ? [...section.content] : section.content
+}));
+var flushTurnDraft = (draft) => {
+  if (draft.currentTools.length > 0) {
+    draft.sections.push({ type: "tools", content: draft.currentTools });
+    draft.currentTools = [];
+  }
+  if (draft.currentText.length > 0) {
+    draft.sections.push({ type: "text", content: draft.currentText });
+    draft.currentText = "";
+  }
+};
+var buildToolCompletedText = (event) => {
+  const input = event.input;
+  const output = event.output;
+  const meta = [`${event.duration}ms`];
+  let detail = "";
+  if (event.tool === "bash" && input && typeof input.command === "string") {
+    detail = input.command;
+  } else if (event.tool === "web_search") {
+    const q = input?.query || output?.query || "";
+    if (q) detail = `"${q.length > 60 ? q.slice(0, 57) + "..." : q}"`;
+  } else if (event.tool === "web_fetch") {
+    const u = input?.url || output?.url || "";
+    if (u) detail = u;
+  } else if (event.tool === "spawn_subagent") {
+    if (input && typeof input.task === "string") detail = input.task;
+  } else if (input) {
+    for (const [, v] of Object.entries(input)) {
+      if (typeof v === "string" && v.length > 0) {
+        detail = v.length > 80 ? v.slice(0, 77) + "..." : v;
+        break;
+      }
+    }
+  }
+  if (detail) {
+    detail = detail.replace(/\n/g, " ");
+    meta.push(detail);
+  }
+  let text = `- done \`${event.tool}\`` + (meta.length > 0 ? ` (${meta.join(", ")})` : "");
+  if (event.tool === "spawn_subagent" && output?.subagentId) {
+    text += ` [subagent:${output.subagentId}]`;
+  }
+  if (event.tool === "bash" && typeof output?.exitCode === "number" && output.exitCode !== 0) {
+    text += ` \u2014 exit ${output.exitCode}`;
+  }
+  if (event.tool === "web_search" && Array.isArray(output?.results)) {
+    text += ` \u2014 ${output.results.length} result${output.results.length !== 1 ? "s" : ""}`;
+  }
+  return text;
+};
+var recordStandardTurnEvent = (draft, event) => {
+  if (event.type === "model:chunk") {
+    if (draft.currentTools.length > 0) {
+      draft.sections.push({ type: "tools", content: draft.currentTools });
+      draft.currentTools = [];
+      if (draft.assistantResponse.length > 0 && !/\s$/.test(draft.assistantResponse)) {
+        draft.assistantResponse += " ";
+      }
+    }
+    draft.assistantResponse += event.content;
+    draft.currentText += event.content;
+    return;
+  }
+  if (event.type === "tool:started") {
+    if (draft.currentText.length > 0) {
+      draft.sections.push({ type: "text", content: draft.currentText });
+      draft.currentText = "";
+    }
+    const input = event.input;
+    let startDetail = "";
+    if (event.tool === "bash" && input && typeof input.command === "string") {
+      startDetail = input.command;
+    } else if (event.tool === "web_fetch" && input && typeof input.url === "string") {
+      startDetail = input.url;
+    } else if (event.tool === "web_search" && input && typeof input.query === "string") {
+      startDetail = `"${input.query}"`;
+    } else if (input) {
+      for (const [, v] of Object.entries(input)) {
+        if (typeof v === "string" && v.length > 0) {
+          startDetail = v.length > 80 ? v.slice(0, 77) + "..." : v;
+          break;
+        }
+      }
+    }
+    if (startDetail) startDetail = startDetail.replace(/\n/g, " ");
+    const toolText = `- start \`${event.tool}\`` + (startDetail ? ` (${startDetail})` : "");
+    draft.toolTimeline.push(toolText);
+    draft.currentTools.push(toolText);
+    return;
+  }
+  if (event.type === "tool:completed") {
+    const toolText = buildToolCompletedText(event);
+    draft.toolTimeline.push(toolText);
+    draft.currentTools.push(toolText);
+    return;
+  }
+  if (event.type === "tool:error") {
+    const toolText = `- error \`${event.tool}\`: ${event.error}`;
+    draft.toolTimeline.push(toolText);
+    draft.currentTools.push(toolText);
+  }
+};
+var buildAssistantMetadata = (draft, sectionsOverride, opts) => {
+  const sections = sectionsOverride ?? cloneSections(draft.sections);
+  const hasContent = draft.toolTimeline.length > 0 || sections.length > 0;
+  if (!hasContent && !opts?.id) return void 0;
+  const meta = {};
+  if (opts?.id) meta.id = opts.id;
+  if (opts?.timestamp) meta.timestamp = opts.timestamp;
+  if (draft.toolTimeline.length > 0) meta.toolActivity = [...draft.toolTimeline];
+  if (sections.length > 0) meta.sections = sections;
+  return meta;
+};
+var executeConversationTurn = async ({
+  harness,
+  runInput,
+  events,
+  initialContextTokens = 0,
+  initialContextWindow = 0,
+  onEvent
+}) => {
+  const draft = createTurnDraftState();
+  let latestRunId = "";
+  let runCancelled = false;
+  let runContinuation = false;
+  let runContinuationMessages;
+  let runHarnessMessages;
+  let runContextTokens = initialContextTokens;
+  let runContextWindow = initialContextWindow;
+  let runSteps = 0;
+  let runMaxSteps;
+  const source = events ?? harness.runWithTelemetry(runInput);
+  for await (const event of source) {
+    recordStandardTurnEvent(draft, event);
+    if (event.type === "run:started") {
+      latestRunId = event.runId;
+    }
+    if (event.type === "run:cancelled") {
+      runCancelled = true;
+    }
+    if (event.type === "run:completed") {
+      runContinuation = event.result.continuation === true;
+      runContinuationMessages = event.result.continuationMessages;
+      runHarnessMessages = event.result.continuationMessages;
+      runContextTokens = event.result.contextTokens ?? runContextTokens;
+      runContextWindow = event.result.contextWindow ?? runContextWindow;
+      runSteps = event.result.steps;
+      if (typeof event.result.maxSteps === "number") {
+        runMaxSteps = event.result.maxSteps;
+      }
+      if (draft.assistantResponse.length === 0 && event.result.response) {
+        draft.assistantResponse = event.result.response;
+      }
+    }
+    if (event.type === "run:error") {
+      draft.assistantResponse = draft.assistantResponse || `[Error: ${event.error.message}]`;
+    }
+    if (onEvent) {
+      await onEvent(event, draft);
+    }
+  }
+  return {
+    latestRunId,
+    runCancelled,
+    runContinuation,
+    runContinuationMessages,
+    runHarnessMessages,
+    runContextTokens,
+    runContextWindow,
+    runSteps,
+    runMaxSteps,
+    draft
+  };
+};
+var normalizePendingToolCalls = (value) => {
+  if (!Array.isArray(value)) return [];
+  return value.filter((entry) => {
+    if (!entry || typeof entry !== "object") return false;
+    const row = entry;
+    return typeof row.id === "string" && typeof row.name === "string" && typeof row.input === "object" && row.input !== null;
+  }).map((entry) => ({ id: entry.id, name: entry.name, input: entry.input }));
+};
+var normalizeApprovalCheckpoint = (approval, fallbackMessages) => ({
+  ...approval,
+  checkpointMessages: isMessageArray(approval.checkpointMessages) ? approval.checkpointMessages : [...fallbackMessages],
+  baseMessageCount: typeof approval.baseMessageCount === "number" && approval.baseMessageCount >= 0 ? approval.baseMessageCount : 0,
+  pendingToolCalls: normalizePendingToolCalls(approval.pendingToolCalls)
+});
+var buildApprovalCheckpoints = ({
+  approvals,
+  runId,
+  checkpointMessages,
+  baseMessageCount,
+  pendingToolCalls
+}) => approvals.map((approval) => ({
+  approvalId: approval.approvalId,
+  runId,
+  tool: approval.tool,
+  toolCallId: approval.toolCallId,
+  input: approval.input,
+  checkpointMessages,
+  baseMessageCount,
+  pendingToolCalls
+}));
+var applyTurnMetadata = (conv, meta, opts = {}) => {
+  const {
+    clearContinuation = true,
+    clearApprovals = true,
+    setIdle = true,
+    shouldRebuildCanonical = false
+  } = opts;
+  if (meta.continuation && meta.continuationMessages) {
+    conv._continuationMessages = meta.continuationMessages;
+  } else if (clearContinuation) {
+    conv._continuationMessages = void 0;
+    conv._continuationCount = void 0;
+  }
+  if (meta.harnessMessages) {
+    conv._harnessMessages = meta.harnessMessages;
+  } else if (shouldRebuildCanonical) {
+    conv._harnessMessages = conv.messages;
+  }
+  if (meta.toolResultArchive !== void 0) {
+    conv._toolResultArchive = meta.toolResultArchive;
+  }
+  conv.runtimeRunId = meta.latestRunId || conv.runtimeRunId;
+  if (clearApprovals) conv.pendingApprovals = [];
+  if (setIdle) conv.runStatus = "idle";
+  if (meta.contextTokens > 0) conv.contextTokens = meta.contextTokens;
+  if (meta.contextWindow > 0) conv.contextWindow = meta.contextWindow;
+  conv.updatedAt = Date.now();
+};
+
+// src/orchestrator/continuation.ts
+var TOOL_RESULT_ARCHIVE_PARAM2 = "__toolResultArchive";
+var withToolResultArchiveParam = (parameters, conversation) => ({
+  ...parameters ?? {},
+  [TOOL_RESULT_ARCHIVE_PARAM2]: conversation._toolResultArchive ?? {}
+});
+var MAX_CONTINUATION_COUNT = 20;
+
+// src/orchestrator/subagents.ts
+var MAX_SUBAGENT_NESTING = 3;
+var MAX_CONCURRENT_SUBAGENTS = 2;
+var MAX_SUBAGENT_CALLBACK_COUNT = 20;
+var CALLBACK_LOCK_STALE_MS = 5 * 60 * 1e3;
+var STALE_SUBAGENT_THRESHOLD_MS = 5 * 60 * 1e3;
+
+// src/orchestrator/orchestrator.ts
+var AgentOrchestrator = class {
+  harness;
+  conversationStore;
+  eventSink;
+  telemetry;
+  /** @internal */
+  hooks;
+  agentId;
+  workingDir;
+  // ── Runtime state (conversation runs) ──
+  activeConversationRuns = /* @__PURE__ */ new Map();
+  runOwners = /* @__PURE__ */ new Map();
+  runConversations = /* @__PURE__ */ new Map();
+  approvalDecisionTracker = /* @__PURE__ */ new Map();
+  // ── Runtime state (subagents) ──
+  activeSubagentRuns = /* @__PURE__ */ new Map();
+  recentlySpawnedParents = /* @__PURE__ */ new Map();
+  pendingSubagentApprovals = /* @__PURE__ */ new Map();
+  pendingCallbackNeeded = /* @__PURE__ */ new Set();
+  constructor(options) {
+    this.harness = options.harness;
+    this.conversationStore = options.conversationStore;
+    this.eventSink = options.eventSink;
+    this.telemetry = options.telemetry;
+    this.hooks = options.hooks ?? options.continuationHooks;
+    this.agentId = options.agentId ?? options.harness.frontmatter?.id ?? "";
+    this.workingDir = options.workingDir ?? "";
+  }
+  setHooks(hooks) {
+    this.hooks = hooks;
+  }
+  /** @deprecated Use setHooks instead */
+  setContinuationHooks(hooks) {
+    this.hooks = hooks;
+  }
+  get isServerless() {
+    return typeof this.hooks?.dispatchBackground === "function";
+  }
+  // ══════════════════════════════════════════════════════════════════════════
+  // Continuation
+  // ══════════════════════════════════════════════════════════════════════════
+  async runContinuation(conversationId, onYield) {
+    const conversation = await this.conversationStore.getWithArchive(conversationId);
+    if (!conversation) return;
+    if (Array.isArray(conversation.pendingApprovals) && conversation.pendingApprovals.length > 0) return;
+    if (!conversation._continuationMessages?.length) return;
+    if (conversation.runStatus === "running") return;
+    const count = (conversation._continuationCount ?? 0) + 1;
+    if (count > MAX_CONTINUATION_COUNT) {
+      console.warn(`[poncho][continuation] Max continuation count (${MAX_CONTINUATION_COUNT}) reached for ${conversationId}`);
+      conversation._continuationMessages = void 0;
+      conversation._continuationCount = void 0;
+      await this.conversationStore.update(conversation);
+      return;
+    }
+    const continuationMessages = [...conversation._continuationMessages];
+    conversation._continuationMessages = void 0;
+    conversation._continuationCount = count;
+    conversation.runStatus = "running";
+    await this.conversationStore.update(conversation);
+    const abortController = new AbortController();
+    this.activeConversationRuns.set(conversationId, {
+      ownerId: conversation.ownerId,
+      abortController,
+      runId: null
+    });
+    this.hooks?.onContinuationStart?.(conversationId);
+    try {
+      if (conversation.parentConversationId) {
+        for await (const event of this.runSubagentContinuation(conversationId, conversation, continuationMessages)) {
+          if (onYield) await onYield(event);
+        }
+      } else {
+        await this.runChatContinuation(conversationId, conversation, continuationMessages, onYield);
+      }
+    } finally {
+      this.activeConversationRuns.delete(conversationId);
+      this.hooks?.onContinuationEnd?.(conversationId);
+    }
+  }
+  async runChatContinuation(conversationId, conversation, continuationMessages, onYield) {
+    const execution = await executeConversationTurn({
+      harness: this.harness,
+      runInput: {
+        conversationId,
+        tenantId: conversation.tenantId ?? void 0,
+        parameters: withToolResultArchiveParam({
+          __activeConversationId: conversationId,
+          __ownerId: conversation.ownerId
+        }, conversation),
+        messages: continuationMessages,
+        abortSignal: this.activeConversationRuns.get(conversationId)?.abortController.signal
+      },
+      initialContextTokens: conversation.contextTokens ?? 0,
+      initialContextWindow: conversation.contextWindow ?? 0,
+      onEvent: async (event) => {
+        if (event.type === "run:started") {
+          this.runOwners.set(event.runId, conversation.ownerId);
+          this.runConversations.set(event.runId, conversationId);
+          const active = this.activeConversationRuns.get(conversationId);
+          if (active) active.runId = event.runId;
+        }
+        if (this.telemetry) await this.telemetry.emit(event);
+        await this.eventSink(conversationId, event);
+        if (onYield) await onYield(event);
+      }
+    });
+    flushTurnDraft(execution.draft);
+    const freshConv = await this.conversationStore.get(conversationId);
+    if (!freshConv) return;
+    const hasContent = execution.draft.assistantResponse.length > 0 || execution.draft.toolTimeline.length > 0;
+    if (hasContent) {
+      freshConv.messages = [
+        ...freshConv.messages,
+        {
+          role: "assistant",
+          content: execution.draft.assistantResponse,
+          metadata: buildAssistantMetadata(execution.draft)
+        }
+      ];
+    }
+    applyTurnMetadata(freshConv, {
+      latestRunId: execution.latestRunId,
+      contextTokens: execution.runContextTokens,
+      contextWindow: execution.runContextWindow,
+      continuation: execution.runContinuation,
+      continuationMessages: execution.runContinuationMessages,
+      harnessMessages: execution.runHarnessMessages,
+      toolResultArchive: this.harness.getToolResultArchive(conversationId)
+    }, { shouldRebuildCanonical: true });
+    if (execution.runContinuation) {
+      freshConv._continuationCount = conversation._continuationCount;
+    }
+    await this.conversationStore.update(freshConv);
+  }
+  // ══════════════════════════════════════════════════════════════════════════
+  // Approval checkpoint management
+  // ══════════════════════════════════════════════════════════════════════════
+  async findPendingApproval(approvalId, owner) {
+    const searchedConversationIds = /* @__PURE__ */ new Set();
+    const scan = async (conversations) => {
+      for (const conv of conversations) {
+        if (searchedConversationIds.has(conv.conversationId)) continue;
+        searchedConversationIds.add(conv.conversationId);
+        if (!Array.isArray(conv.pendingApprovals)) continue;
+        const match = conv.pendingApprovals.find((a) => a.approvalId === approvalId);
+        if (match) {
+          return { conversation: conv, approval: match };
+        }
+      }
+      return void 0;
+    };
+    const ownerScoped = await scan(await this.conversationStore.list(owner));
+    if (ownerScoped) return ownerScoped;
+    if (owner === "local-owner") {
+      return await scan(await this.conversationStore.list());
+    }
+    return void 0;
+  }
+  async resumeRunFromCheckpoint(conversationId, conversation, checkpoint, toolResults) {
+    const abortController = new AbortController();
+    this.activeConversationRuns.set(conversationId, {
+      ownerId: conversation.ownerId,
+      abortController,
+      runId: null
+    });
+    let latestRunId = conversation.runtimeRunId ?? "";
+    let checkpointedRun = false;
+    const normalizedCheckpoint = normalizeApprovalCheckpoint(checkpoint, conversation.messages);
+    const baseMessages = normalizedCheckpoint.baseMessageCount != null ? conversation.messages.slice(0, normalizedCheckpoint.baseMessageCount) : [];
+    const fullCheckpointMessages = [...baseMessages, ...normalizedCheckpoint.checkpointMessages];
+    let resumeToolResultMsg;
+    const lastCpMsg = fullCheckpointMessages[fullCheckpointMessages.length - 1];
+    if (lastCpMsg?.role === "assistant") {
+      try {
+        const parsed = JSON.parse(typeof lastCpMsg.content === "string" ? lastCpMsg.content : "");
+        const cpToolCalls = parsed.tool_calls ?? [];
+        if (cpToolCalls.length > 0) {
+          const providedMap = new Map(toolResults.map((r) => [r.callId, r]));
+          resumeToolResultMsg = {
+            role: "tool",
+            content: JSON.stringify(cpToolCalls.map((tc) => {
+              const provided = providedMap.get(tc.id);
+              return {
+                type: "tool_result",
+                tool_use_id: tc.id,
+                tool_name: provided?.toolName ?? tc.name,
+                content: provided ? provided.error ? `Tool error: ${provided.error}` : JSON.stringify(provided.result ?? null) : "Tool error: Tool execution deferred (pending approval checkpoint)"
+              };
+            })),
+            metadata: { timestamp: Date.now() }
+          };
+        }
+      } catch {
+      }
+    }
+    const fullCheckpointWithResults = resumeToolResultMsg ? [...fullCheckpointMessages, resumeToolResultMsg] : fullCheckpointMessages;
+    let draftRef;
+    let execution;
+    try {
+      execution = await executeConversationTurn({
+        harness: this.harness,
+        events: this.harness.continueFromToolResult({
+          messages: fullCheckpointMessages,
+          toolResults,
+          conversationId,
+          abortSignal: abortController.signal
+        }),
+        initialContextTokens: conversation.contextTokens ?? 0,
+        initialContextWindow: conversation.contextWindow ?? 0,
+        onEvent: async (event, draft2) => {
+          draftRef = draft2;
+          if (event.type === "run:started") {
+            latestRunId = event.runId;
+            this.runOwners.set(event.runId, conversation.ownerId);
+            this.runConversations.set(event.runId, conversationId);
+            const active = this.activeConversationRuns.get(conversationId);
+            if (active && active.abortController === abortController) {
+              active.runId = event.runId;
+            }
+          }
+          if (event.type === "tool:approval:required") {
+            const toolText = `- approval required \`${event.tool}\``;
+            draft2.toolTimeline.push(toolText);
+            draft2.currentTools.push(toolText);
+          }
+          if (event.type === "tool:approval:checkpoint") {
+            const cpEvent = event;
+            const conv = await this.conversationStore.get(conversationId);
+            if (conv) {
+              conv.pendingApprovals = buildApprovalCheckpoints({
+                approvals: cpEvent.approvals,
+                runId: latestRunId,
+                checkpointMessages: [...fullCheckpointWithResults, ...cpEvent.checkpointMessages],
+                baseMessageCount: 0,
+                pendingToolCalls: cpEvent.pendingToolCalls
+              });
+              conv.updatedAt = Date.now();
+              await this.conversationStore.update(conv);
+              this.hooks?.onApprovalCheckpoint?.(
+                conversationId,
+                cpEvent.approvals.map((a) => ({ approvalId: a.approvalId, tool: a.tool, input: a.input }))
+              );
+            }
+            checkpointedRun = true;
+          }
+          if (this.telemetry) await this.telemetry.emit(event);
+          await this.eventSink(conversationId, event);
+        }
+      });
+      flushTurnDraft(execution.draft);
+      latestRunId = execution.latestRunId || latestRunId;
+    } catch (err) {
+      console.error("[resume-run] error:", err instanceof Error ? err.message : err);
+      if (draftRef) {
+        draftRef.assistantResponse = draftRef.assistantResponse || `[Error: ${err instanceof Error ? err.message : "Unknown error"}]`;
+        flushTurnDraft(draftRef);
+      }
+    }
+    const draft = execution?.draft ?? draftRef ?? createTurnDraftState();
+    if (!checkpointedRun) {
+      const conv = await this.conversationStore.get(conversationId);
+      if (conv) {
+        const hasAssistantContent = draft.assistantResponse.length > 0 || draft.toolTimeline.length > 0 || draft.sections.length > 0;
+        if (hasAssistantContent) {
+          const prevMessages = conv.messages;
+          const lastMsg = prevMessages[prevMessages.length - 1];
+          if (lastMsg && lastMsg.role === "assistant" && lastMsg.metadata) {
+            const existingToolActivity = lastMsg.metadata.toolActivity;
+            const existingSections = lastMsg.metadata.sections;
+            const mergedTimeline = [
+              ...Array.isArray(existingToolActivity) ? existingToolActivity : [],
+              ...draft.toolTimeline
+            ];
+            const mergedSections = [
+              ...Array.isArray(existingSections) ? existingSections : [],
+              ...draft.sections
+            ];
+            const mergedText = (typeof lastMsg.content === "string" ? lastMsg.content : "") + draft.assistantResponse;
+            conv.messages = [
+              ...prevMessages.slice(0, -1),
+              {
+                role: "assistant",
+                content: mergedText,
+                metadata: {
+                  toolActivity: mergedTimeline,
+                  sections: mergedSections.length > 0 ? mergedSections : void 0
+                }
+              }
+            ];
+          } else {
+            conv.messages = [
+              ...prevMessages,
+              {
+                role: "assistant",
+                content: draft.assistantResponse,
+                metadata: buildAssistantMetadata(draft)
+              }
+            ];
+          }
+        }
+        applyTurnMetadata(conv, {
+          latestRunId,
+          contextTokens: execution?.runContextTokens ?? 0,
+          contextWindow: execution?.runContextWindow ?? 0,
+          harnessMessages: execution?.runHarnessMessages
+        }, { shouldRebuildCanonical: true });
+        await this.conversationStore.update(conv);
+      }
+    } else {
+      const conv = await this.conversationStore.get(conversationId);
+      if (conv) {
+        conv.runStatus = "idle";
+        conv.updatedAt = Date.now();
+        await this.conversationStore.update(conv);
+      }
+    }
+    this.activeConversationRuns.delete(conversationId);
+    if (latestRunId) {
+      this.runOwners.delete(latestRunId);
+      this.runConversations.delete(latestRunId);
+    }
+    console.log("[resume-run] complete for", conversationId);
+    if (this.hooks?.onResumeComplete) {
+      this.hooks.onResumeComplete(conversationId, checkpointedRun);
+    } else {
+      await this._handlePostResumeWork(conversationId);
+    }
+  }
+  /** After a resume completes, check for deferred subagent callbacks. */
+  async _handlePostResumeWork(conversationId) {
+    const hadDeferred = this.pendingCallbackNeeded.delete(conversationId);
+    const postConv = await this.conversationStore.get(conversationId);
+    const needsCallback = hadDeferred || !!postConv?.pendingSubagentResults?.length;
+    const hasRunningChildren = this.hasRunningSubagentsForParent(conversationId);
+    if (!needsCallback && !hasRunningChildren) {
+      this.hooks?.onStreamEnd?.(conversationId);
+    }
+    if (needsCallback) {
+      this.processSubagentCallback(conversationId, true).catch(
+        (err) => console.error(`[poncho][subagent-callback] Post-resume callback failed:`, err instanceof Error ? err.message : err)
+      );
+    }
+  }
+  // ══════════════════════════════════════════════════════════════════════════
+  // Subagent lifecycle
+  // ══════════════════════════════════════════════════════════════════════════
+  // ── Helpers ──
+  hasRunningSubagentsForParent(parentConversationId) {
+    for (const run of this.activeSubagentRuns.values()) {
+      if (run.parentConversationId === parentConversationId) return true;
+    }
+    return false;
+  }
+  getRunningSubagentCountForParent(parentId) {
+    let count = 0;
+    for (const run of this.activeSubagentRuns.values()) {
+      if (run.parentConversationId === parentId) count += 1;
+    }
+    return count;
+  }
+  async getSubagentDepth(conversationId) {
+    let depth = 0;
+    let current = await this.conversationStore.get(conversationId);
+    while (current?.parentConversationId) {
+      depth += 1;
+      current = await this.conversationStore.get(current.parentConversationId);
+    }
+    return depth;
+  }
+  async hasPendingSubagentWorkForParent(parentConversationId, _owner) {
+    if (this.hasRunningSubagentsForParent(parentConversationId)) return true;
+    if (this.recentlySpawnedParents.has(parentConversationId)) return true;
+    if (this.pendingCallbackNeeded.has(parentConversationId)) return true;
+    const parentConversation = await this.conversationStore.get(parentConversationId);
+    if (!parentConversation) return false;
+    if (Array.isArray(parentConversation.pendingSubagentResults) && parentConversation.pendingSubagentResults.length > 0) return true;
+    if (typeof parentConversation.runningCallbackSince === "number" && parentConversation.runningCallbackSince > 0) return true;
+    return false;
+  }
+  // ── Subagent approval decision ──
+  /**
+   * Submit an approval decision for a pending subagent approval.
+   * Returns whether the approval was found, the child conversation, and whether all approvals are now decided.
+   */
+  async submitSubagentApprovalDecision(approvalId, approved) {
+    const pending = this.pendingSubagentApprovals.get(approvalId);
+    if (!pending) return { found: false, allDecided: false };
+    const decision = approved ? "approved" : "denied";
+    pending.checkpoint.decision = decision;
+    await this.eventSink(
+      pending.childConversationId,
+      approved ? { type: "tool:approval:granted", approvalId } : { type: "tool:approval:denied", approvalId }
+    );
+    const childConv = await this.conversationStore.get(pending.childConversationId);
+    if (childConv && Array.isArray(childConv.pendingApprovals)) {
+      childConv.pendingApprovals = childConv.pendingApprovals.map(
+        (pa) => pa.approvalId === approvalId ? { ...pa, decision } : pa
+      );
+      await this.conversationStore.update(childConv);
+    }
+    const allApprovals = childConv?.pendingApprovals ?? [];
+    const allDecided = allApprovals.length > 0 && allApprovals.every((pa) => pa.decision != null);
+    if (allDecided) {
+      for (const pa of allApprovals) this.pendingSubagentApprovals.delete(pa.approvalId);
+      if (childConv) {
+        childConv.pendingApprovals = [];
+        await this.conversationStore.update(childConv);
+      }
+      pending.resolve(allApprovals);
+    }
+    return { found: true, childConversationId: pending.childConversationId, allDecided };
+  }
+  // ── Completion + checkpoint resume ──
+  async handleSubagentCompletion(subagentId) {
+    const conv = await this.conversationStore.get(subagentId);
+    if (!conv || !conv.parentConversationId) return;
+    if (conv.subagentMeta?.status === "completed" || conv.subagentMeta?.status === "error") return;
+    conv.subagentMeta = { ...conv.subagentMeta, status: "completed" };
+    conv.updatedAt = Date.now();
+    await this.conversationStore.update(conv);
+    const lastMsg = conv.messages[conv.messages.length - 1];
+    const responseText = lastMsg?.role === "assistant" && typeof lastMsg.content === "string" ? lastMsg.content : "";
+    const pendingResult = {
+      subagentId,
+      task: conv.subagentMeta?.task ?? conv.title,
+      status: "completed",
+      result: { status: "completed", response: responseText, steps: 0, tokens: { input: 0, output: 0, cached: 0 }, duration: 0 },
+      timestamp: Date.now()
+    };
+    await this.conversationStore.appendSubagentResult(conv.parentConversationId, pendingResult);
+    await this.eventSink(conv.parentConversationId, {
+      type: "subagent:completed",
+      subagentId,
+      conversationId: subagentId
+    });
+    await this.triggerParentCallback(conv.parentConversationId);
+  }
+  async resumeSubagentFromCheckpoint(subagentId) {
+    const conv = await this.conversationStore.get(subagentId);
+    if (!conv || !conv.parentConversationId) return;
+    const allApprovals = (conv.pendingApprovals ?? []).map(
+      (approval) => normalizeApprovalCheckpoint(approval, conv.messages)
+    );
+    if (allApprovals.length === 0) return;
+    const allDecided = allApprovals.every((a) => a.decision != null);
+    if (!allDecided) return;
+    conv.pendingApprovals = [];
+    conv.subagentMeta = { ...conv.subagentMeta, status: "running" };
+    await this.conversationStore.update(conv);
+    const checkpointRef = allApprovals[0];
+    const toolContext = {
+      runId: checkpointRef.runId,
+      agentId: this.agentId,
+      step: 0,
+      workingDir: this.workingDir,
+      parameters: {},
+      conversationId: subagentId
+    };
+    const approvalToolCallIds = new Set(allApprovals.map((a) => a.toolCallId));
+    const callsToExecute = [];
+    const deniedResults = [];
+    for (const a of allApprovals) {
+      if (a.decision === "approved" && a.toolCallId) {
+        callsToExecute.push({ id: a.toolCallId, name: a.tool, input: a.input });
+      } else if (a.decision === "denied" && a.toolCallId) {
+        deniedResults.push({ callId: a.toolCallId, toolName: a.tool, error: "Tool execution denied by user" });
+      }
+    }
+    const pendingToolCalls = checkpointRef.pendingToolCalls ?? [];
+    for (const tc of pendingToolCalls) {
+      if (!approvalToolCallIds.has(tc.id)) callsToExecute.push(tc);
+    }
+    let toolResults = [...deniedResults];
+    if (callsToExecute.length > 0) {
+      const execResults = await this.harness.executeTools(callsToExecute, toolContext);
+      toolResults.push(...execResults.map((r) => ({
+        callId: r.callId,
+        toolName: r.tool,
+        result: r.output,
+        error: r.error
+      })));
+    }
+    await this.resumeRunFromCheckpoint(subagentId, conv, checkpointRef, toolResults);
+    await this.handleSubagentCompletion(subagentId);
+  }
+  // ── Subagent run ──
+  async runSubagent(childConversationId, parentConversationId, task, ownerId) {
+    if (!this.hooks?.createChildHarness) {
+      throw new Error("createChildHarness hook is required for subagent support");
+    }
+    const childHarness = await this.hooks.createChildHarness();
+    const childAbortController = new AbortController();
+    this.activeSubagentRuns.set(childConversationId, { abortController: childAbortController, harness: childHarness, parentConversationId });
+    this.activeConversationRuns.set(childConversationId, {
+      ownerId,
+      abortController: childAbortController,
+      runId: null
+    });
+    const spawnCount = this.recentlySpawnedParents.get(parentConversationId) ?? 0;
+    if (spawnCount <= 1) {
+      this.recentlySpawnedParents.delete(parentConversationId);
+    } else {
+      this.recentlySpawnedParents.set(parentConversationId, spawnCount - 1);
+    }
+    childHarness.unregisterTools(["memory_main_write", "memory_main_edit"]);
+    const draft = createTurnDraftState();
+    let latestRunId = "";
+    let runResult;
+    try {
+      const conversation = await this.conversationStore.getWithArchive(childConversationId);
+      if (!conversation) throw new Error("Subagent conversation not found");
+      if (conversation.subagentMeta?.status === "stopped") return;
+      conversation.lastActivityAt = Date.now();
+      await this.conversationStore.update(conversation);
+      const runOutcome = resolveRunRequest(conversation, {
+        conversationId: childConversationId,
+        messages: conversation.messages
+      });
+      const harnessMessages = [...runOutcome.messages];
+      const recallParams = this.hooks?.buildRecallParams?.({ ownerId, tenantId: conversation.tenantId, excludeConversationId: childConversationId }) ?? {};
+      for await (const event of childHarness.runWithTelemetry({
+        task,
+        conversationId: childConversationId,
+        tenantId: conversation.tenantId ?? void 0,
+        parameters: withToolResultArchiveParam({
+          ...recallParams,
+          __activeConversationId: childConversationId,
+          __ownerId: ownerId
+        }, conversation),
+        messages: harnessMessages,
+        abortSignal: childAbortController.signal
+      })) {
+        if (event.type === "run:started") {
+          latestRunId = event.runId;
+          const active = this.activeConversationRuns.get(childConversationId);
+          if (active) active.runId = event.runId;
+        }
+        recordStandardTurnEvent(draft, event);
+        if (event.type === "tool:approval:required") {
+          const toolText = `- approval required \`${event.tool}\``;
+          draft.toolTimeline.push(toolText);
+          draft.currentTools.push(toolText);
+          await this.eventSink(parentConversationId, {
+            type: "subagent:approval_needed",
+            subagentId: childConversationId,
+            conversationId: childConversationId,
+            tool: event.tool,
+            approvalId: event.approvalId,
+            input: event.input
+          });
+        }
+        if (event.type === "tool:approval:checkpoint") {
+          const cpConv = await this.conversationStore.get(childConversationId);
+          if (cpConv) {
+            const allCpData = buildApprovalCheckpoints({
+              approvals: event.approvals,
+              runId: latestRunId,
+              checkpointMessages: [...harnessMessages, ...event.checkpointMessages],
+              baseMessageCount: 0,
+              pendingToolCalls: event.pendingToolCalls
+            });
+            cpConv.pendingApprovals = allCpData;
+            cpConv.updatedAt = Date.now();
+            await this.conversationStore.update(cpConv);
+            const decidedApprovals = await new Promise((resolve12) => {
+              for (const cpData of allCpData) {
+                this.pendingSubagentApprovals.set(cpData.approvalId, {
+                  resolve: resolve12,
+                  childHarness,
+                  checkpoint: cpData,
+                  childConversationId,
+                  parentConversationId
+                });
+              }
+            });
+            const checkpointRef = normalizeApprovalCheckpoint(allCpData[0], [...harnessMessages]);
+            const toolContext = {
+              runId: checkpointRef.runId,
+              agentId: this.agentId,
+              step: 0,
+              workingDir: this.workingDir,
+              parameters: {},
+              conversationId: childConversationId
+            };
+            const approvalToolCallIds = new Set(decidedApprovals.map((a) => a.toolCallId));
+            const callsToExecute = [];
+            const deniedResults = [];
+            for (const a of decidedApprovals) {
+              if (a.decision === "approved" && a.toolCallId) {
+                callsToExecute.push({ id: a.toolCallId, name: a.tool, input: a.input });
+                const toolText = `- done \`${a.tool}\``;
+                draft.toolTimeline.push(toolText);
+                draft.currentTools.push(toolText);
+              } else if (a.toolCallId) {
+                deniedResults.push({ callId: a.toolCallId, toolName: a.tool, error: "Tool execution denied by user" });
+                const toolText = `- denied \`${a.tool}\``;
+                draft.toolTimeline.push(toolText);
+                draft.currentTools.push(toolText);
+              }
+            }
+            const cpPendingToolCalls = checkpointRef.pendingToolCalls ?? [];
+            for (const tc of cpPendingToolCalls) {
+              if (!approvalToolCallIds.has(tc.id)) {
+                callsToExecute.push(tc);
+              }
+            }
+            let toolResults = [...deniedResults];
+            if (callsToExecute.length > 0) {
+              const execResults = await childHarness.executeTools(callsToExecute, toolContext);
+              toolResults.push(...execResults.map((r) => ({
+                callId: r.callId,
+                toolName: r.tool,
+                result: r.output,
+                error: r.error
+              })));
+            }
+            const resumeMessages = [...checkpointRef.checkpointMessages];
+            for await (const resumeEvent of childHarness.continueFromToolResult({
+              messages: resumeMessages,
+              toolResults,
+              conversationId: childConversationId,
+              abortSignal: childAbortController.signal
+            })) {
+              recordStandardTurnEvent(draft, resumeEvent);
+              if (resumeEvent.type === "run:completed") {
+                runResult = { status: resumeEvent.result.status, response: resumeEvent.result.response, steps: resumeEvent.result.steps, duration: resumeEvent.result.duration };
+                if (draft.assistantResponse.length === 0 && resumeEvent.result.response) {
+                  draft.assistantResponse = resumeEvent.result.response;
+                }
+              }
+              if (resumeEvent.type === "run:error") {
+                draft.assistantResponse = draft.assistantResponse || `[Error: ${resumeEvent.error.message}]`;
+              }
+              await this.eventSink(childConversationId, resumeEvent);
+            }
+          }
+        }
+        if (event.type === "run:completed") {
+          runResult = { status: event.result.status, response: event.result.response, steps: event.result.steps, duration: event.result.duration, continuation: event.result.continuation, continuationMessages: event.result.continuationMessages };
+          if (draft.assistantResponse.length === 0 && event.result.response) {
+            draft.assistantResponse = event.result.response;
+          }
+        }
+        if (event.type === "run:error") {
+          draft.assistantResponse = draft.assistantResponse || `[Error: ${event.error.message}]`;
+        }
+        await this.eventSink(childConversationId, event);
+      }
+      flushTurnDraft(draft);
+      const conv = await this.conversationStore.get(childConversationId);
+      if (conv) {
+        const hasContent = draft.assistantResponse.length > 0 || draft.toolTimeline.length > 0;
+        if (hasContent) {
+          conv.messages.push({
+            role: "assistant",
+            content: draft.assistantResponse,
+            metadata: buildAssistantMetadata(draft)
+          });
+        }
+        if (runResult?.continuation && runResult.continuationMessages) {
+          conv._continuationMessages = runResult.continuationMessages;
+        } else {
+          conv._continuationMessages = void 0;
+          conv._continuationCount = void 0;
+        }
+        if (runResult?.continuationMessages) {
+          conv._harnessMessages = runResult.continuationMessages;
+        } else if (runOutcome.shouldRebuildCanonical) {
+          conv._harnessMessages = conv.messages;
+        }
+        conv._toolResultArchive = childHarness.getToolResultArchive(childConversationId);
+        conv.lastActivityAt = Date.now();
+        conv.updatedAt = Date.now();
+        if (runResult?.continuation) {
+          await this.conversationStore.update(conv);
+          this.hooks?.onStreamEnd?.(childConversationId);
+          this.activeSubagentRuns.delete(childConversationId);
+          this.activeConversationRuns.delete(childConversationId);
+          try {
+            await childHarness.shutdown();
+          } catch {
+          }
+          if (this.isServerless) {
+            this.hooks.dispatchBackground("continuation", childConversationId);
+          } else {
+            this.runContinuation(childConversationId).catch(
+              (err) => console.error(`[poncho][subagent] Continuation failed:`, err instanceof Error ? err.message : err)
+            );
+          }
+          return;
+        }
+        conv.subagentMeta = { ...conv.subagentMeta, status: "completed" };
+        await this.conversationStore.update(conv);
+      }
+      this.hooks?.onStreamEnd?.(childConversationId);
+      await this.eventSink(parentConversationId, {
+        type: "subagent:completed",
+        subagentId: childConversationId,
+        conversationId: childConversationId
+      });
+      let subagentResponse = runResult?.response ?? draft.assistantResponse;
+      if (!subagentResponse) {
+        const freshSubConv = await this.conversationStore.get(childConversationId);
+        if (freshSubConv) {
+          const lastAssistant = [...freshSubConv.messages].reverse().find((m) => m.role === "assistant");
+          if (lastAssistant && typeof lastAssistant.content === "string") {
+            subagentResponse = lastAssistant.content;
+          }
+        }
+      }
+      const pendingResult = {
+        subagentId: childConversationId,
+        task,
+        status: "completed",
+        result: runResult ? { status: runResult.status, response: subagentResponse, steps: runResult.steps, tokens: { input: 0, output: 0, cached: 0 }, duration: runResult.duration } : void 0,
+        timestamp: Date.now()
+      };
+      await this.conversationStore.appendSubagentResult(parentConversationId, pendingResult);
+      this.triggerParentCallback(parentConversationId).catch(
+        (err) => console.error(`[poncho][subagent] Parent callback failed:`, err instanceof Error ? err.message : err)
+      );
+    } catch (err) {
+      const errMsg = err instanceof Error ? err.message : String(err);
+      console.error(`[poncho][subagent] Error in subagent ${childConversationId}:`, errMsg);
+      const conv = await this.conversationStore.get(childConversationId);
+      if (conv) {
+        conv.subagentMeta = {
+          ...conv.subagentMeta,
+          status: "error",
+          error: { code: "SUBAGENT_ERROR", message: errMsg }
+        };
+        conv.updatedAt = Date.now();
+        await this.conversationStore.update(conv);
+      }
+      this.hooks?.onStreamEnd?.(childConversationId);
+      await this.eventSink(parentConversationId, {
+        type: "subagent:error",
+        subagentId: childConversationId,
+        conversationId: childConversationId,
+        error: errMsg
+      });
+      const pendingResult = {
+        subagentId: childConversationId,
+        task,
+        status: "error",
+        error: { code: "SUBAGENT_ERROR", message: errMsg },
+        timestamp: Date.now()
+      };
+      await this.conversationStore.appendSubagentResult(parentConversationId, pendingResult).catch(() => {
+      });
+      this.triggerParentCallback(parentConversationId).catch(
+        (err2) => console.error(`[poncho][subagent] Parent callback failed:`, err2 instanceof Error ? err2.message : err2)
+      );
+    } finally {
+      for (const [aid, pa] of this.pendingSubagentApprovals) {
+        if (pa.childHarness === childHarness) {
+          this.pendingSubagentApprovals.delete(aid);
+        }
+      }
+      this.activeSubagentRuns.delete(childConversationId);
+      this.activeConversationRuns.delete(childConversationId);
+      try {
+        await childHarness.shutdown();
+      } catch {
+      }
+    }
+  }
+  // ── Parent callback ──
+  async triggerParentCallback(parentConversationId) {
+    if (this.activeConversationRuns.has(parentConversationId)) {
+      this.pendingCallbackNeeded.add(parentConversationId);
+      return;
+    }
+    if (this.isServerless) {
+      this.hooks.dispatchBackground("subagent-callback", parentConversationId);
+      return;
+    }
+    await this.processSubagentCallback(parentConversationId);
+  }
+  async processSubagentCallback(conversationId, skipLockCheck = false) {
+    const conversation = await this.conversationStore.getWithArchive(conversationId);
+    if (!conversation) return;
+    const pendingResults = conversation.pendingSubagentResults ?? [];
+    const hasOrphanedContinuation = pendingResults.length === 0 && Array.isArray(conversation._continuationMessages) && conversation._continuationMessages.length > 0 && !this.activeConversationRuns.has(conversationId);
+    if (pendingResults.length === 0 && !hasOrphanedContinuation) return;
+    if (!skipLockCheck && conversation.runningCallbackSince) {
+      const elapsed = Date.now() - conversation.runningCallbackSince;
+      if (elapsed < CALLBACK_LOCK_STALE_MS) return;
+      console.warn(`[poncho][subagent-callback] Stale lock detected (${elapsed}ms) for ${conversationId}, proceeding`);
+    }
+    conversation.pendingSubagentResults = [];
+    conversation.runningCallbackSince = Date.now();
+    conversation.runStatus = "running";
+    const callbackCount = (conversation.subagentCallbackCount ?? 0) + 1;
+    conversation.subagentCallbackCount = callbackCount;
+    for (const pr of pendingResults) {
+      const resultBody = pr.result ? `Status: ${pr.result.status}
+Response: ${pr.result.response ?? "(no response)"}
+Steps: ${pr.result.steps}, Duration: ${pr.result.duration}ms` : pr.error ? `Error: ${pr.error.message}` : "(no result)";
+      conversation.messages.push({
+        role: "user",
+        content: `[Subagent Result] Subagent "${pr.task}" (${pr.subagentId}) ${pr.status}:
+
+${resultBody}`,
+        metadata: { _subagentCallback: true, subagentId: pr.subagentId, task: pr.task, timestamp: pr.timestamp }
+      });
+    }
+    const processedIds = new Set(pendingResults.map((pr) => pr.subagentId));
+    const freshForPending = await this.conversationStore.get(conversationId);
+    const arrivedDuringCallback = (freshForPending?.pendingSubagentResults ?? []).filter((pr) => !processedIds.has(pr.subagentId));
+    conversation.pendingSubagentResults = arrivedDuringCallback;
+    conversation._harnessMessages = [...conversation.messages];
+    conversation.updatedAt = Date.now();
+    await this.conversationStore.update(conversation);
+    if (callbackCount > MAX_SUBAGENT_CALLBACK_COUNT) {
+      console.warn(`[poncho][subagent-callback] Circuit breaker: ${callbackCount} callbacks for ${conversationId}, skipping re-run`);
+      conversation.runningCallbackSince = void 0;
+      conversation.runStatus = "idle";
+      await this.conversationStore.update(conversation);
+      return;
+    }
+    const isContinuationResume = hasOrphanedContinuation && pendingResults.length === 0;
+    console.log(`[poncho][subagent-callback] Processing ${pendingResults.length} result(s) for ${conversationId} (callback #${callbackCount})${isContinuationResume ? " (continuation resume)" : ""}`);
+    const abortController = new AbortController();
+    this.activeConversationRuns.set(conversationId, {
+      ownerId: conversation.ownerId,
+      abortController,
+      runId: null
+    });
+    this.hooks?.onCallbackStreamReset?.(conversationId);
+    const historySelection = resolveRunRequest(conversation, {
+      conversationId,
+      messages: conversation.messages,
+      preferContinuation: isContinuationResume
+    });
+    const historyMessages = [...historySelection.messages];
+    console.info(
+      `[poncho][subagent-callback] conversation="${conversationId}" history_source=${historySelection.source}`
+    );
+    let execution;
+    try {
+      execution = await executeConversationTurn({
+        harness: this.harness,
+        runInput: {
+          task: void 0,
+          conversationId,
+          tenantId: conversation.tenantId ?? void 0,
+          parameters: withToolResultArchiveParam({
+            __activeConversationId: conversationId,
+            __ownerId: conversation.ownerId
+          }, conversation),
+          messages: historyMessages,
+          abortSignal: abortController.signal
+        },
+        initialContextTokens: conversation.contextTokens ?? 0,
+        initialContextWindow: conversation.contextWindow ?? 0,
+        onEvent: (event) => {
+          if (event.type === "run:started") {
+            const active = this.activeConversationRuns.get(conversationId);
+            if (active) active.runId = event.runId;
+          }
+          this.eventSink(conversationId, event);
+        }
+      });
+      flushTurnDraft(execution.draft);
+      const callbackNeedsContinuation = execution.runContinuation && execution.runContinuationMessages;
+      if (callbackNeedsContinuation || execution.draft.assistantResponse.length > 0 || execution.draft.toolTimeline.length > 0) {
+        const freshConv = await this.conversationStore.get(conversationId);
+        if (freshConv) {
+          if (!callbackNeedsContinuation) {
+            freshConv.messages.push({
+              role: "assistant",
+              content: execution.draft.assistantResponse,
+              metadata: buildAssistantMetadata(execution.draft)
+            });
+          }
+          applyTurnMetadata(freshConv, {
+            latestRunId: execution.latestRunId,
+            contextTokens: execution.runContextTokens,
+            contextWindow: execution.runContextWindow,
+            continuation: !!callbackNeedsContinuation,
+            continuationMessages: execution.runContinuationMessages,
+            harnessMessages: callbackNeedsContinuation ? execution.runHarnessMessages : void 0,
+            toolResultArchive: this.harness.getToolResultArchive(conversationId)
+          }, { shouldRebuildCanonical: true, clearApprovals: false });
+          freshConv.runningCallbackSince = void 0;
+          await this.conversationStore.update(freshConv);
+          if (freshConv.channelMeta && execution.draft.assistantResponse.length > 0) {
+            this.hooks?.onMessagingNotify?.(conversationId, execution.draft.assistantResponse);
+          }
+        }
+      }
+      if (execution.runContinuation) {
+        if (this.isServerless) {
+          this.hooks.dispatchBackground("subagent-callback", conversationId);
+        } else {
+          this.processSubagentCallback(conversationId, true).catch(
+            (err) => console.error(`[poncho][subagent-callback] Continuation failed:`, err instanceof Error ? err.message : err)
+          );
+        }
+      }
+    } catch (err) {
+      console.error(`[poncho][subagent-callback] Error during parent re-run for ${conversationId}:`, err instanceof Error ? err.message : err);
+      const errConv = await this.conversationStore.get(conversationId);
+      if (errConv) {
+        errConv.runningCallbackSince = void 0;
+        errConv.runStatus = "idle";
+        await this.conversationStore.update(errConv);
+      }
+    } finally {
+      this.activeConversationRuns.delete(conversationId);
+      const hadDeferredTrigger = this.pendingCallbackNeeded.delete(conversationId);
+      const freshConv = await this.conversationStore.get(conversationId);
+      const hasPendingInStore = !!freshConv?.pendingSubagentResults?.length;
+      const hasRunningCallbackChildren = this.hasRunningSubagentsForParent(conversationId);
+      if (!hadDeferredTrigger && !hasPendingInStore && !hasRunningCallbackChildren) {
+        this.hooks?.onStreamEnd?.(conversationId);
+      }
+      if (hadDeferredTrigger || hasPendingInStore) {
+        if (this.isServerless) {
+          this.hooks.dispatchBackground("subagent-callback", conversationId);
+        } else {
+          this.processSubagentCallback(conversationId, true).catch(
+            (err) => console.error(`[poncho][subagent-callback] Recursive callback failed:`, err instanceof Error ? err.message : err)
+          );
+        }
+      } else if (freshConv?.runningCallbackSince) {
+        const afterClear = await this.conversationStore.clearCallbackLock(conversationId);
+        if (afterClear?.pendingSubagentResults?.length) {
+          if (this.isServerless) {
+            this.hooks.dispatchBackground("subagent-callback", conversationId);
+          } else {
+            this.processSubagentCallback(conversationId, true).catch(
+              (err) => console.error(`[poncho][subagent-callback] Post-clear callback failed:`, err instanceof Error ? err.message : err)
+            );
+          }
+        }
+      }
+    }
+  }
+  // ── Subagent continuation ──
+  async *runSubagentContinuation(conversationId, conversation, continuationMessages) {
+    if (!this.hooks?.createChildHarness) {
+      throw new Error("createChildHarness hook is required for subagent support");
+    }
+    const parentConversationId = conversation.parentConversationId;
+    const task = conversation.subagentMeta?.task ?? "";
+    const ownerId = conversation.ownerId;
+    const childHarness = await this.hooks.createChildHarness();
+    childHarness.unregisterTools(["memory_main_write", "memory_main_edit"]);
+    const childAbortController = this.activeConversationRuns.get(conversationId)?.abortController ?? new AbortController();
+    this.activeSubagentRuns.set(conversationId, { abortController: childAbortController, harness: childHarness, parentConversationId });
+    const draft = createTurnDraftState();
+    let runResult;
+    try {
+      const recallParams = this.hooks?.buildRecallParams?.({ ownerId, tenantId: conversation.tenantId, excludeConversationId: conversationId }) ?? {};
+      for await (const event of childHarness.runWithTelemetry({
+        conversationId,
+        tenantId: conversation.tenantId ?? void 0,
+        parameters: withToolResultArchiveParam({
+          ...recallParams,
+          __activeConversationId: conversationId,
+          __ownerId: ownerId
+        }, conversation),
+        messages: continuationMessages,
+        abortSignal: childAbortController.signal
+      })) {
+        if (event.type === "run:started") {
+          const active = this.activeConversationRuns.get(conversationId);
+          if (active) active.runId = event.runId;
+        }
+        recordStandardTurnEvent(draft, event);
+        if (event.type === "run:completed") {
+          runResult = {
+            status: event.result.status,
+            response: event.result.response,
+            steps: event.result.steps,
+            duration: event.result.duration,
+            continuation: event.result.continuation,
+            continuationMessages: event.result.continuationMessages
+          };
+          if (!draft.assistantResponse && event.result.response) {
+            draft.assistantResponse = event.result.response;
+          }
+        }
+        if (event.type === "run:error") {
+          draft.assistantResponse = draft.assistantResponse || `[Error: ${event.error.message}]`;
+        }
+        await this.eventSink(conversationId, event);
+        yield event;
+      }
+      flushTurnDraft(draft);
+      const conv = await this.conversationStore.get(conversationId);
+      if (conv) {
+        const hasContent = draft.assistantResponse.length > 0 || draft.toolTimeline.length > 0;
+        if (runResult?.continuation && runResult.continuationMessages) {
+          if (hasContent) {
+            conv.messages.push({
+              role: "assistant",
+              content: draft.assistantResponse,
+              metadata: buildAssistantMetadata(draft)
+            });
+          }
+          conv._continuationMessages = runResult.continuationMessages;
+          conv._continuationCount = conversation._continuationCount;
+        } else {
+          conv._continuationMessages = void 0;
+          conv._continuationCount = void 0;
+          if (hasContent) {
+            conv.messages.push({
+              role: "assistant",
+              content: draft.assistantResponse,
+              metadata: buildAssistantMetadata(draft)
+            });
+          }
+        }
+        if (runResult?.continuationMessages) {
+          conv._harnessMessages = runResult.continuationMessages;
+        } else {
+          conv._harnessMessages = conv.messages;
+        }
+        conv._toolResultArchive = childHarness.getToolResultArchive(conversationId);
+        conv.lastActivityAt = Date.now();
+        conv.runStatus = "idle";
+        conv.updatedAt = Date.now();
+        if (runResult?.continuation) {
+          await this.conversationStore.update(conv);
+          this.activeSubagentRuns.delete(conversationId);
+          try {
+            await childHarness.shutdown();
+          } catch {
+          }
+          return;
+        }
+        conv.subagentMeta = { ...conv.subagentMeta, status: "completed" };
+        await this.conversationStore.update(conv);
+      }
+      this.activeSubagentRuns.delete(conversationId);
+      await this.eventSink(parentConversationId, {
+        type: "subagent:completed",
+        subagentId: conversationId,
+        conversationId
+      });
+      let subagentResponse = runResult?.response ?? draft.assistantResponse;
+      if (!subagentResponse) {
+        const freshSubConv = await this.conversationStore.get(conversationId);
+        if (freshSubConv) {
+          const lastAssistant = [...freshSubConv.messages].reverse().find((m) => m.role === "assistant");
+          if (lastAssistant) {
+            subagentResponse = typeof lastAssistant.content === "string" ? lastAssistant.content : "";
+          }
+        }
+      }
+      const parentConv = await this.conversationStore.get(parentConversationId);
+      if (parentConv) {
+        const result = {
+          subagentId: conversationId,
+          task,
+          status: "completed",
+          result: { status: "completed", response: subagentResponse, steps: runResult?.steps ?? 0, tokens: { input: 0, output: 0, cached: 0 }, duration: runResult?.duration ?? 0 },
+          timestamp: Date.now()
+        };
+        await this.conversationStore.appendSubagentResult(parentConversationId, result);
+        if (this.isServerless) {
+          this.hooks.dispatchBackground("subagent-callback", parentConversationId);
+        } else {
+          this.processSubagentCallback(parentConversationId).catch(
+            (err) => console.error(`[poncho][subagent] Callback failed:`, err instanceof Error ? err.message : err)
+          );
+        }
+      }
+      try {
+        await childHarness.shutdown();
+      } catch {
+      }
+    } catch (err) {
+      this.activeSubagentRuns.delete(conversationId);
+      try {
+        await childHarness.shutdown();
+      } catch {
+      }
+      const conv = await this.conversationStore.get(conversationId);
+      if (conv) {
+        conv.subagentMeta = { ...conv.subagentMeta, status: "error", error: { code: "CONTINUATION_ERROR", message: err instanceof Error ? err.message : String(err) } };
+        conv.runStatus = "idle";
+        conv._continuationMessages = void 0;
+        conv._continuationCount = void 0;
+        conv.updatedAt = Date.now();
+        await this.conversationStore.update(conv);
+      }
+      await this.eventSink(conversation.parentConversationId, {
+        type: "subagent:completed",
+        subagentId: conversationId,
+        conversationId
+      });
+      const parentConv = await this.conversationStore.get(conversation.parentConversationId);
+      if (parentConv) {
+        const result = {
+          subagentId: conversationId,
+          task,
+          status: "error",
+          error: { code: "CONTINUATION_ERROR", message: err instanceof Error ? err.message : String(err) },
+          timestamp: Date.now()
+        };
+        await this.conversationStore.appendSubagentResult(conversation.parentConversationId, result);
+        if (this.isServerless) {
+          this.hooks.dispatchBackground("subagent-callback", conversation.parentConversationId);
+        } else {
+          this.processSubagentCallback(conversation.parentConversationId).catch(() => {
+          });
+        }
+      }
+    }
+  }
+  // ── SubagentManager factory ──
+  createSubagentManager() {
+    return {
+      spawn: async (opts) => {
+        const depth = await this.getSubagentDepth(opts.parentConversationId);
+        if (depth >= MAX_SUBAGENT_NESTING - 1) {
+          throw new Error(`Maximum subagent nesting (${MAX_SUBAGENT_NESTING} levels) reached. Cannot spawn deeper subagents.`);
+        }
+        if (this.getRunningSubagentCountForParent(opts.parentConversationId) >= MAX_CONCURRENT_SUBAGENTS) {
+          throw new Error(`Maximum concurrent subagents (${MAX_CONCURRENT_SUBAGENTS}) per parent reached. Wait for running subagents to complete or stop some first.`);
+        }
+        const conversation = await this.conversationStore.create(
+          opts.ownerId,
+          opts.task.slice(0, 80),
+          opts.tenantId ?? null,
+          {
+            parentConversationId: opts.parentConversationId,
+            subagentMeta: { task: opts.task, status: "running" },
+            messages: [{ role: "user", content: opts.task }]
+          }
+        );
+        this.recentlySpawnedParents.set(
+          opts.parentConversationId,
+          (this.recentlySpawnedParents.get(opts.parentConversationId) ?? 0) + 1
+        );
+        await this.eventSink(opts.parentConversationId, {
+          type: "subagent:spawned",
+          subagentId: conversation.conversationId,
+          conversationId: conversation.conversationId,
+          task: opts.task
+        });
+        if (this.isServerless) {
+          this.hooks.dispatchBackground("subagent-run", conversation.conversationId);
+        } else {
+          this.runSubagent(
+            conversation.conversationId,
+            opts.parentConversationId,
+            opts.task,
+            opts.ownerId
+          ).catch((err) => console.error(`[poncho][subagent] Background spawn failed:`, err instanceof Error ? err.message : err));
+        }
+        return { subagentId: conversation.conversationId };
+      },
+      sendMessage: async (subagentId, message) => {
+        const conversation = await this.conversationStore.get(subagentId);
+        if (!conversation) {
+          console.error(`[poncho][subagent] sendMessage: conversation "${subagentId}" not found in store`);
+          throw new Error(`Subagent "${subagentId}" not found.`);
+        }
+        if (!conversation.parentConversationId) {
+          throw new Error(`Conversation "${subagentId}" is not a subagent.`);
+        }
+        if (!conversation.subagentMeta) {
+          console.warn(`[poncho][subagent] sendMessage: conversation "${subagentId}" missing subagentMeta, recovering`);
+          conversation.subagentMeta = { task: conversation.title, status: "stopped" };
+          await this.conversationStore.update(conversation);
+        }
+        if (conversation.subagentMeta.status === "running") {
+          throw new Error(`Subagent "${subagentId}" is currently running. Wait for it to complete before sending a new message.`);
+        }
+        conversation.messages.push({ role: "user", content: message });
+        conversation.subagentMeta.status = "running";
+        conversation.updatedAt = Date.now();
+        await this.conversationStore.update(conversation);
+        if (this.isServerless) {
+          this.hooks.dispatchBackground("subagent-run", subagentId);
+        } else {
+          this.runSubagent(
+            subagentId,
+            conversation.parentConversationId,
+            message,
+            conversation.ownerId
+          ).catch((err) => console.error(`[poncho][subagent] Background sendMessage failed:`, err instanceof Error ? err.message : err));
+        }
+        return { subagentId };
+      },
+      stop: async (subagentId) => {
+        const active = this.activeSubagentRuns.get(subagentId);
+        if (active) {
+          active.abortController.abort();
+        }
+        const conversation = await this.conversationStore.get(subagentId);
+        if (conversation?.subagentMeta && conversation.subagentMeta.status === "running") {
+          conversation.subagentMeta.status = "stopped";
+          conversation.updatedAt = Date.now();
+          await this.conversationStore.update(conversation);
+        }
+      },
+      list: async (parentConversationId) => {
+        const parentConv = await this.conversationStore.get(parentConversationId);
+        const summaries = await this.conversationStore.listSummaries(parentConv?.ownerId ?? "local-owner");
+        const childSummaries = summaries.filter((s) => s.parentConversationId === parentConversationId);
+        const results = [];
+        for (const s of childSummaries) {
+          const c = await this.conversationStore.get(s.conversationId);
+          if (c) {
+            results.push({
+              subagentId: c.conversationId,
+              task: c.subagentMeta?.task ?? c.title,
+              status: c.subagentMeta?.status ?? "stopped",
+              messageCount: c.messages.length
+            });
+          }
+        }
+        return results;
+      }
+    };
+  }
+  // ── Stale subagent recovery ──
+  async recoverStaleSubagents() {
+    const allSummaries = await this.conversationStore.listSummaries();
+    const subagentSummaries = allSummaries.filter((s) => s.parentConversationId);
+    if (subagentSummaries.length === 0) return;
+    const parentsToCallback = /* @__PURE__ */ new Set();
+    const CONCURRENCY = 10;
+    for (let i = 0; i < subagentSummaries.length; i += CONCURRENCY) {
+      const batch = subagentSummaries.slice(i, i + CONCURRENCY);
+      const convs = await Promise.all(batch.map((s) => this.conversationStore.get(s.conversationId)));
+      for (const conv of convs) {
+        if (conv?.subagentMeta?.status === "running" && conv.parentConversationId) {
+          const lastActivity = conv.lastActivityAt ?? conv.updatedAt;
+          const elapsed = Date.now() - lastActivity;
+          if (elapsed < STALE_SUBAGENT_THRESHOLD_MS) continue;
+          conv.subagentMeta.status = "error";
+          conv.subagentMeta.error = { code: "STALE_SUBAGENT", message: `Subagent inactive for ${Math.round(elapsed / 1e3)}s (threshold: ${STALE_SUBAGENT_THRESHOLD_MS / 1e3}s)` };
+          conv.updatedAt = Date.now();
+          await this.conversationStore.update(conv);
+          const pendingResult = {
+            subagentId: conv.conversationId,
+            task: conv.subagentMeta.task,
+            status: "error",
+            error: conv.subagentMeta.error,
+            timestamp: Date.now()
+          };
+          await this.conversationStore.appendSubagentResult(conv.parentConversationId, pendingResult);
+          parentsToCallback.add(conv.parentConversationId);
+        }
+      }
+    }
+    for (const parentId of parentsToCallback) {
+      this.processSubagentCallback(parentId).catch(
+        (err) => console.error(`[poncho][subagent] Recovery callback failed for ${parentId}:`, err instanceof Error ? err.message : err)
+      );
+    }
+  }
+};
+
 // src/index.ts
 import { defineTool as defineTool13 } from "@poncho-ai/sdk";
 export {
   AgentHarness,
+  AgentOrchestrator,
   BashEnvironmentManager,
+  CALLBACK_LOCK_STALE_MS,
   InMemoryConversationStore,
   InMemoryEngine,
   InMemoryStateStore,
   LocalMcpBridge,
   LocalUploadStore,
+  MAX_CONCURRENT_SUBAGENTS,
+  MAX_CONTINUATION_COUNT,
+  MAX_SUBAGENT_CALLBACK_COUNT,
+  MAX_SUBAGENT_NESTING,
   OPENAI_CODEX_CLIENT_ID,
   PONCHO_UPLOAD_SCHEME,
   PonchoFsAdapter,
   PostgresEngine,
   S3UploadStore,
+  STALE_SUBAGENT_THRESHOLD_MS,
   STORAGE_SCHEMA_VERSION,
   SqliteEngine,
+  TOOL_RESULT_ARCHIVE_PARAM2 as TOOL_RESULT_ARCHIVE_PARAM,
   TelemetryEmitter,
   ToolDispatcher,
   VFS_SCHEME,
   VercelBlobUploadStore,
+  applyTurnMetadata,
   buildAgentDirectoryName,
+  buildApprovalCheckpoints,
+  buildAssistantMetadata,
   buildSkillContextWindow,
+  buildToolCompletedText,
+  cloneSections,
   compactMessages,
   completeOpenAICodexDeviceAuth,
+  computeNextOccurrence,
   createBashTool,
   createConversationStore,
   createConversationStoreFromEngine,
@@ -10653,6 +12741,7 @@ export {
   createStorageEngine,
   createSubagentTools,
   createTodoStoreFromEngine,
+  createTurnDraftState,
   createUploadStore,
   createWriteTool,
   defineTool13 as defineTool,
@@ -10661,7 +12750,9 @@ export {
   ensureAgentIdentity,
   estimateTokens,
   estimateTotalTokens,
+  executeConversationTurn,
   findSafeSplitPoint,
+  flushTurnDraft,
   generateAgentId,
   getAgentStoreDirectory,
   getModelContextWindow,
@@ -10669,11 +12760,15 @@ export {
   getOpenAICodexAuthFilePath,
   getOpenAICodexRequiredScopes,
   getPonchoStoreRoot,
+  isMessageArray,
   jsonSchemaToZod,
+  loadCanonicalHistory,
   loadPonchoConfig,
+  loadRunHistory,
   loadSkillContext,
   loadSkillInstructions,
   loadSkillMetadata,
+  normalizeApprovalCheckpoint,
   normalizeOtlp,
   normalizeScriptPolicyPath,
   parseAgentFile,
@@ -10681,15 +12776,18 @@ export {
   ponchoDocsTool,
   readOpenAICodexSession,
   readSkillResource,
+  recordStandardTurnEvent,
   renderAgentPrompt,
   resolveAgentIdentity,
   resolveCompactionConfig,
   resolveEnv,
   resolveMemoryConfig,
+  resolveRunRequest,
   resolveSkillDirs,
   resolveStateConfig,
   slugifyStorageComponent,
   startOpenAICodexDeviceAuth,
   verifyTenantToken,
+  withToolResultArchiveParam,
   writeOpenAICodexSession
 };