@agentproto/runtime 2.3.0 → 2.4.0

package/dist/index.mjs

@@ -2573,7 +2573,7 @@ function resolveAuthSpec(input) {
   }
   if (!provider) return void 0;
   const sub = input.descriptor.authSubscription;
-  const supportsSub = sub !== void 0 && (gatewayRoute === void 0 || isNativeGatewayPreset);
+  const supportsSub = (sub !== void 0 || input.descriptor.modelDerivedApiKey === true) && (gatewayRoute === void 0 || isNativeGatewayPreset);
   const enforce = input.descriptor.authEnforce ?? "when-configured";
   const external = supportsSub && sub?.external === true;
   const subCredAvailable = input.subscriptionCredential !== void 0 || external && input.externalSubscriptionVerified === true;
@@ -2605,7 +2605,7 @@ function resolveAuthSpec(input) {
     credentialSource = subCredAvailable ? "cli-local-login" : "none";
     externalCredential = true;
   } else if (mode === "subscription") {
-    setEnv = sub.setEnv;
+    setEnv = sub?.setEnv ?? apiKeyEnv;
     credential = input.subscriptionCredential;
     credentialSource = credential !== void 0 ? input.subscriptionCredentialSource ?? "explicit-config" : "none";
   } else {
@@ -3679,7 +3679,8 @@ function resolveModelId(id) {
 }
 function methodsForDirect(descriptor) {
   const methods = [];
-  if (descriptor?.authSubscription) methods.push("oauth-bearer");
+  if (descriptor?.authSubscription || descriptor?.modelDerivedApiKey)
+    methods.push("oauth-bearer");
   if (descriptor?.provider || descriptor?.modelDerivedApiKey) methods.push("api-key");
   return methods;
 }
@@ -7505,6 +7506,8 @@ function toSessionSummary(desc) {
     lastOutputAt: desc.lastOutputAt,
     lastActivityAt: desc.lastActivityAt,
     processAlive: desc.processAlive,
+    watchers: desc.watchers,
+    childrenBusy: desc.childrenBusy,
     label: desc.label,
     title: desc.title,
     renamedByUser: desc.renamedByUser,
@@ -7532,6 +7535,7 @@ function toSessionSummary(desc) {
     turnsCompleted: desc.turnsCompleted,
     busy: desc.busy,
     blockedOn: desc.blockedOn,
+    stalledSinceMs: desc.stalledSinceMs,
     origin: desc.origin,
     parentSessionId: desc.parentSessionId,
     depth: desc.depth,
@@ -7659,6 +7663,28 @@ function createSessionsRegistry(opts) {
   const sessionEvents = opts?.sessionEvents;
   const resolveAgentAdapter = opts?.resolveAgentAdapter;
   const sessions = /* @__PURE__ */ new Map();
+  const watchersById = /* @__PURE__ */ new Map();
+  const stampWatchers = (desc) => {
+    desc.watchers = watchersById.get(desc.id) ?? 0;
+  };
+  const childrenBusyCounts = () => {
+    const all = Array.from(sessions.values());
+    const parentOf = new Map(all.map((s) => [s.desc.id, s.desc.parentSessionId]));
+    const counts = /* @__PURE__ */ new Map();
+    for (const s of all) {
+      const d = s.desc;
+      const midTurn = d.busy === true && (d.status === "running" || d.status === "starting");
+      if (!midTurn) continue;
+      const seen = /* @__PURE__ */ new Set([d.id]);
+      let pid = d.parentSessionId;
+      while (pid && !seen.has(pid)) {
+        seen.add(pid);
+        counts.set(pid, (counts.get(pid) ?? 0) + 1);
+        pid = parentOf.get(pid);
+      }
+    }
+    return counts;
+  };
   const pendingPermissions = /* @__PURE__ */ new Map();
   let persistTimer = null;
   let nextSubId = 1;
@@ -7722,6 +7748,17 @@ function createSessionsRegistry(opts) {
       ...rt.desc.endedReason ? { reason: rt.desc.endedReason } : {}
     });
   };
+  const clearStalledFlag = (rt) => {
+    if (rt.desc.stalledSinceMs === void 0) return;
+    rt.desc.stalledSinceMs = void 0;
+    schedulePersist();
+    sessionEvents?.emit({
+      type: "session:stall-cleared",
+      sessionId: rt.desc.id,
+      ...rt.desc.label ? { label: rt.desc.label } : {},
+      ts: (/* @__PURE__ */ new Date()).toISOString()
+    });
+  };
   const refreshAwaitingPermission = (rt) => {
     let has = false;
     for (const p of pendingPermissions.values()) {
@@ -8503,6 +8540,7 @@ ${message}`;
     rt.desc.awaitingInput = false;
     rt.desc.awaitingQuestion = void 0;
     releaseBlockedOn(rt.desc);
+    clearStalledFlag(rt);
     let turnCompleted = false;
     let sawTurnEnd = false;
     let abnormalReason;
@@ -8560,6 +8598,7 @@ ${message}`;
       rt.desc.busy = false;
       rt.emitter.emit("busy", false);
       releaseBlockedOn(rt.desc);
+      clearStalledFlag(rt);
       if (pendingToolCallIds.size > 0) {
         for (const toolCallId of pendingToolCallIds) {
           const synthetic = {
@@ -9501,13 +9540,17 @@ ${message}`;
       const rt = sessions.get(id);
       if (!rt) return;
       rt.desc.lastActivityAt = (/* @__PURE__ */ new Date()).toISOString();
+      clearStalledFlag(rt);
       schedulePersist();
     },
     list(opts2) {
       const includeArchived = opts2?.includeArchived ?? false;
+      const childrenBusy = childrenBusyCounts();
       return Array.from(sessions.values()).map((s) => s.desc).filter((desc) => includeArchived || !desc.archived).sort((a, b) => b.startedAt.localeCompare(a.startedAt)).map((desc) => {
         stampProcessAlive(desc);
         stampInterrupted(desc);
+        stampWatchers(desc);
+        desc.childrenBusy = childrenBusy.get(desc.id) ?? 0;
         return desc;
       });
     },
@@ -9515,11 +9558,14 @@ ${message}`;
       const includeArchived = opts2?.includeArchived ?? false;
       const limit = Math.max(1, Math.min(200, opts2?.limit ?? 50));
       const offset = Math.max(0, opts2?.offset ?? 0);
+      const childrenBusy = childrenBusyCounts();
       const all = Array.from(sessions.values()).map((s) => s.desc).filter((desc) => includeArchived || !desc.archived).sort((a, b) => b.startedAt.localeCompare(a.startedAt));
       const slice = all.slice(offset, offset + limit);
       const summaries = slice.map((desc) => {
         stampProcessAlive(desc);
         stampInterrupted(desc);
+        stampWatchers(desc);
+        desc.childrenBusy = childrenBusy.get(desc.id) ?? 0;
         return toSessionSummary(desc);
       });
       return { summaries, total: all.length };
@@ -9529,9 +9575,19 @@ ${message}`;
       if (desc) {
         stampProcessAlive(desc);
         stampInterrupted(desc);
+        stampWatchers(desc);
+        desc.childrenBusy = childrenBusyCounts().get(desc.id) ?? 0;
       }
       return desc;
     },
+    incWatchers(id) {
+      watchersById.set(id, (watchersById.get(id) ?? 0) + 1);
+    },
+    decWatchers(id) {
+      const next = (watchersById.get(id) ?? 0) - 1;
+      if (next > 0) watchersById.set(id, next);
+      else watchersById.delete(id);
+    },
     attach(id, onLine) {
       const rt = sessions.get(id);
       if (!rt) return null;
@@ -9698,6 +9754,30 @@ ${message}`;
       emitExited(rt);
       return true;
     },
+    markStalled(id, stalledSinceMs) {
+      const rt = sessions.get(id);
+      if (!rt) return false;
+      if (rt.desc.kind !== "agent-cli" || rt.desc.status !== "running") return false;
+      if (rt.desc.busy !== true || rt.desc.blockedOn !== void 0) return false;
+      if (rt.desc.stalledSinceMs !== void 0) return false;
+      rt.desc.stalledSinceMs = stalledSinceMs;
+      schedulePersist();
+      sessionEvents?.emit({
+        type: "session:stalled",
+        sessionId: rt.desc.id,
+        stalledSinceMs,
+        ...rt.desc.label ? { label: rt.desc.label } : {},
+        ts: (/* @__PURE__ */ new Date()).toISOString()
+      });
+      return true;
+    },
+    clearStalled(id) {
+      const rt = sessions.get(id);
+      if (!rt) return false;
+      const wasFlagged = rt.desc.stalledSinceMs !== void 0;
+      clearStalledFlag(rt);
+      return wasFlagged;
+    },
     isResuming(id) {
       return !!sessions.get(id)?.resumePromise;
     },
@@ -11008,6 +11088,7 @@ function registerAgentTools(server, opts) {
     buildOrchestratorMcp,
     callerScope,
     callerSessionId,
+    mcpBridgeOrigin,
     webhookNotifier,
     daemonMcpUrl,
     loadRoleRegistry: loadRoleRegistry2,
@@ -11285,6 +11366,12 @@ function registerAgentTools(server, opts) {
         {
           ...spawnInput,
           adapter,
+          // Auto-stamp the source channel (#session-visibility): when the
+          // caller didn't pass an explicit `origin`, fall back to the connecting
+          // client's `?origin=` label so a bridge-client spawn (cowork/vscode/
+          // codex) is attributed instead of landing as a bare root. An explicit
+          // `input.origin` (already in `spawnInput`) always wins.
+          ...!spawnInput.origin && mcpBridgeOrigin ? { origin: mcpBridgeOrigin } : {},
           // The trusted caller id (from `?callerSessionId=`) becomes the
           // implicit auto-parent — attach-by-default without the caller
           // passing its own id. An explicit `parentSessionId` still outranks
@@ -12531,6 +12618,15 @@ async function restartAgentSession(registry, resolveAgentAdapter, prev, opts = {
       ...accessProfileEcho ? { accessProfile: accessProfileEcho } : {},
       ...effMode ? { mode: effMode } : {},
       ...resolved.commandPreview ? { commandPreview: resolved.commandPreview } : {},
+      // Lineage carry-forward (#session-visibility). A restart is a NEW
+      // descriptor, but it is the same logical session continued — so its
+      // origin (which channel spawned it: cowork/vscode/codex/cron) and its
+      // parent/depth must survive, exactly as continue-fresh already carries
+      // them (session-continue-fresh.ts). Dropping them here is what left a
+      // restarted session a bare top-level root with no source trace.
+      ...prev.origin ? { origin: prev.origin } : {},
+      ...prev.parentSessionId ? { parentSessionId: prev.parentSessionId } : {},
+      ...prev.depth !== void 0 ? { depth: prev.depth } : {},
       // Verifiability echo (never the credential) — see the auth
       // resolution block above. Absent when no credential resolved,
       // same as session-spawn.ts.
@@ -14106,6 +14202,13 @@ function registerSessionTools(rawServer, opts) {
             rows: input.rows ?? 24,
             ...prev.name ? { name: prev.name } : {},
             ...prev.label ? { label: prev.label } : {},
+            // Lineage carry-forward (#session-visibility) — same reasoning as
+            // the agent branch in session-restart-core.ts: a restart keeps the
+            // logical session's origin/parent/depth rather than resetting it to
+            // a bare root.
+            ...prev.origin ? { origin: prev.origin } : {},
+            ...prev.parentSessionId ? { parentSessionId: prev.parentSessionId } : {},
+            ...prev.depth !== void 0 ? { depth: prev.depth } : {},
             resumedFrom: prev.id,
             resumeVia: describeResumePath(augmented)
           });
@@ -19676,11 +19779,13 @@ async function monitorSessionWait(opts) {
   return new Promise((resolve22) => {
     const unsubs = [];
     let settled = false;
+    for (const id of resolvedIds) registry.incWatchers(id);
     const finish = (result) => {
       if (settled) return;
       settled = true;
       clearTimeout(timer);
       for (const u of unsubs) u();
+      for (const id of resolvedIds) registry.decWatchers(id);
       resolve22(result);
     };
     const relevantTypes = targetEvent === "any" ? ["session:turn-end", "session:awaiting-input", "session:exited"] : targetEvent === "turn-end" ? ["session:turn-end", "session:awaiting-input"] : targetEvent === "awaiting-input" ? ["session:awaiting-input"] : ["session:exited"];
@@ -21039,11 +21144,18 @@ async function startHttpServer(opts) {
     const raw = new URLSearchParams(url.slice(qIdx + 1)).get("callerSessionId");
     return raw && raw.length > 0 ? raw : void 0;
   }
+  function parseOriginQuery(url) {
+    const qIdx = url.indexOf("?");
+    if (qIdx === -1) return void 0;
+    const raw = new URLSearchParams(url.slice(qIdx + 1)).get("origin");
+    return raw && raw.length > 0 ? raw : void 0;
+  }
   async function handleMcp(req, res) {
     if (!authorizeMcp(req, res)) return;
     const denyTools = parseDenyToolsQuery(req.url ?? "");
     const callerSessionId = parseCallerSessionIdQuery(req.url ?? "");
-    const server2 = await opts.mcpServerFactory(denyTools, callerSessionId);
+    const origin = parseOriginQuery(req.url ?? "");
+    const server2 = await opts.mcpServerFactory(denyTools, callerSessionId, origin);
     await serveMcp(req, res, server2);
   }
   async function handleOrchestratorMcp(req, res) {
@@ -21093,7 +21205,8 @@ async function startHttpServer(opts) {
         resumeSessionsOnBoot: opts.meta.resumeSessionsOnBoot === true,
         idleReapAfterMs: opts.meta.idleReapAfterMs ?? 0,
         crashDetectIntervalMs: opts.meta.crashDetectIntervalMs ?? 0,
-        restartSweepIntervalMs: opts.meta.restartSweepIntervalMs ?? 0
+        restartSweepIntervalMs: opts.meta.restartSweepIntervalMs ?? 0,
+        turnStallAfterMs: opts.meta.turnStallAfterMs ?? 0
       })
     );
   }
@@ -24539,6 +24652,49 @@ function runCrashDetectPass(opts) {
   return summary;
 }
 
+// src/stall-watchdog.ts
+function lastActivityMsOf(desc) {
+  const tsStr = desc.lastActivityAt ?? desc.startedAt;
+  const ts = tsStr ? Date.parse(tsStr) : Number.NaN;
+  return Number.isFinite(ts) ? ts : null;
+}
+function isStallCandidate(desc, nowMs, thresholdMs) {
+  if (desc.kind !== "agent-cli") return false;
+  if (desc.status !== "running") return false;
+  if (desc.busy !== true) return false;
+  if (desc.blockedOn !== void 0) return false;
+  if (desc.stalledSinceMs !== void 0) return false;
+  const lastMs = lastActivityMsOf(desc);
+  if (lastMs === null) return false;
+  return nowMs - lastMs > thresholdMs;
+}
+function runStallWatchdogPass(opts) {
+  const { registry, isServed } = opts;
+  const thresholdMs = opts.turnStallAfterMs;
+  if (!thresholdMs || thresholdMs <= 0) {
+    return { enabled: false, candidates: 0, stalled: 0, ids: [] };
+  }
+  const nowMs = opts.now ? opts.now() : Date.now();
+  const all = registry.list({ includeArchived: true });
+  const candidates = all.filter(
+    (d) => (isServed?.(d) ?? true) && isStallCandidate(d, nowMs, thresholdMs)
+  );
+  const summary = {
+    enabled: true,
+    candidates: candidates.length,
+    stalled: 0,
+    ids: []
+  };
+  for (const d of candidates) {
+    const lastMs = lastActivityMsOf(d) ?? nowMs;
+    if (registry.markStalled(d.id, lastMs)) {
+      summary.stalled++;
+      summary.ids.push(d.id);
+    }
+  }
+  return summary;
+}
+
 // src/restart-scheduler.ts
 function isEligibleForRestart(desc) {
   const policy = desc.restartPolicy;
@@ -25638,6 +25794,13 @@ function createAppRegistry(opts) {
     listApps() {
       return [...state.apps];
     },
+    removeApp(appId) {
+      const idx = state.apps.findIndex((a) => a.appId === appId);
+      if (idx === -1) return void 0;
+      const [removed] = state.apps.splice(idx, 1);
+      persist();
+      return removed;
+    },
     createRun(input) {
       const run = {
         appRunId: `apprun_${randomUUID()}`,
@@ -25694,6 +25857,31 @@ function createAppRegistry(opts) {
     }
   };
 }
+var EMPTY_CATALOG = { apps: [] };
+function defaultAppCatalogPath() {
+  return join(homedir(), ".agentproto", "app-catalog.json");
+}
+async function loadAppCatalogFile(path) {
+  const catalogPath = path ?? defaultAppCatalogPath();
+  let raw;
+  try {
+    raw = await readFile(catalogPath, "utf8");
+  } catch {
+    return EMPTY_CATALOG;
+  }
+  try {
+    const parsed = JSON.parse(raw);
+    if (!Array.isArray(parsed.apps)) return EMPTY_CATALOG;
+    const apps = parsed.apps.filter((e) => {
+      if (typeof e !== "object" || e === null) return false;
+      const rec = e;
+      return typeof rec.appId === "string" && typeof rec.dir === "string";
+    });
+    return { apps };
+  } catch {
+    return EMPTY_CATALOG;
+  }
+}
 
 // src/app-tools.ts
 var DEFAULT_AGENT_ADAPTER = "mastra-agent";
@@ -25726,7 +25914,12 @@ async function readAppRefs(dir) {
   const toRefs = (v) => Array.isArray(v) ? v.filter(
     (e) => typeof e === "object" && e !== null && typeof e.id === "string" && typeof e.path === "string"
   ).map((e) => ({ id: e.id, path: resolveRef(dir, e.path) })) : [];
-  return { agents: toRefs(data.agents), workflows: toRefs(data.workflows) };
+  let ui;
+  if (typeof data.ui === "object" && data.ui !== null && typeof data.ui.path === "string") {
+    const uiData = data.ui;
+    ui = { ...uiData, path: resolveRef(dir, uiData.path) };
+  }
+  return { agents: toRefs(data.agents), workflows: toRefs(data.workflows), ...ui ? { ui } : {} };
 }
 async function performInstall(dir, appRegistry, listRegisteredToolIds, resolveAgentAdapter) {
   let handle;
@@ -25764,20 +25957,31 @@ async function performInstall(dir, appRegistry, listRegisteredToolIds, resolveAg
   const unvalidatedAgentTools = [
     ...new Set(handle.agents.flatMap((e) => (e.agent.tools ?? []).map(refIdOf)))
   ];
+  const ui = refs.ui ? {
+    path: refs.ui.path,
+    ...handle.ui?.title !== void 0 ? { title: handle.ui.title } : {},
+    ...handle.ui?.description !== void 0 ? { description: handle.ui.description } : {},
+    ...handle.ui?.tools !== void 0 ? { tools: handle.ui.tools } : {},
+    ...handle.ui?.csp !== void 0 ? { csp: handle.ui.csp } : {}
+  } : void 0;
   const record2 = appRegistry.upsertApp({
     appId: handle.id,
     dir,
     ...handle.version ? { version: handle.version } : {},
     ...handle.name ? { name: handle.name } : {},
+    ...handle.description ? { description: handle.description } : {},
     agents: refs.agents,
     workflows: refs.workflows,
     unvalidatedAgentTools,
-    ...handle.requires ? { requires: handle.requires } : {}
+    ...handle.requires ? { requires: handle.requires } : {},
+    ...ui ? { ui } : {},
+    ...handle.artifacts ? { artifacts: handle.artifacts } : {},
+    ...handle.dev ? { dev: handle.dev } : {}
   });
   return { ok: true, record: record2 };
 }
 function registerAppTools(server, opts) {
-  const { registry, resolveAgentAdapter, listRegisteredToolIds, workflowRunner } = opts;
+  const { registry, resolveAgentAdapter, listRegisteredToolIds, workflowRunner, dispatchTool, callImportedTool } = opts;
   const appRegistry = opts.appRegistry ?? createAppRegistry({
     ...opts.persistPath !== void 0 ? { persistPath: opts.persistPath } : {},
     ...opts.persist !== void 0 ? { persist: opts.persist } : {}
@@ -26026,6 +26230,167 @@ function registerAppTools(server, opts) {
       return textResult(result);
     }
   );
+  server.tool(
+    "app_tool_call",
+    "Call one of an installed app's UI-exposed tools \u2014 the allowlist set at `defineApp({ ui: { tools: [...] } })` time (`app_install`'s `record.ui.tools`). A tool id prefixed `imported:<alias>/<toolName>` dispatches through an imported MCP server (same proxy `mcp_imported_call` uses); every other id dispatches through the daemon's own registered tools (same reach-in routine/cron `target.tool` dispatch uses).",
+    {
+      appId: z.string(),
+      tool: z.string().describe("A tool id from the app's `ui.tools` allowlist."),
+      args: z.record(z.string(), z.unknown()).optional().describe("Tool arguments. Default: empty object.")
+    },
+    async (input) => {
+      const installed = appRegistry.getApp(input.appId);
+      if (!installed || !installed.ui) {
+        return errorResult(`app_tool_call: app "${input.appId}" is not installed or has no UI.`);
+      }
+      const allowlist = installed.ui.tools ?? [];
+      if (!allowlist.includes(input.tool)) {
+        return errorResult(
+          `app_tool_call: tool "${input.tool}" is not in app "${input.appId}"'s ui.tools allowlist: ${allowlist.length > 0 ? allowlist.join(", ") : "(empty)"}`
+        );
+      }
+      const args = input.args ?? {};
+      try {
+        if (input.tool.startsWith("imported:")) {
+          if (!callImportedTool) return notEnabled("app_tool_call");
+          const rest = input.tool.slice("imported:".length);
+          const slash = rest.indexOf("/");
+          if (slash === -1) {
+            return errorResult(
+              `app_tool_call: malformed imported tool id "${input.tool}" \u2014 expected "imported:<alias>/<toolName>".`
+            );
+          }
+          const result2 = await callImportedTool(rest.slice(0, slash), rest.slice(slash + 1), args);
+          return textResult(result2);
+        }
+        if (!dispatchTool) return notEnabled("app_tool_call");
+        const result = await dispatchTool(input.tool, args);
+        return textResult(result);
+      } catch (err) {
+        return errorResult(`app_tool_call: ${err instanceof Error ? err.message : String(err)}`);
+      }
+    }
+  );
+  server.tool(
+    "app_uninstall",
+    "Remove an installed app's record. Refuses if the app is applied to any scope (unapply first via app_unapply) or has a running app_run (stop it first via app_stop).",
+    { appId: z.string() },
+    async (input) => {
+      const applied = appRegistry.listApplied().filter((m) => m.appId === input.appId);
+      if (applied.length > 0) {
+        return errorResult(
+          `app_uninstall: app "${input.appId}" is applied to scope(s) ${applied.map((m) => m.scopeId).join(", ")} \u2014 unapply from scopes first.`
+        );
+      }
+      const runningRuns = appRegistry.listRuns().filter((r) => r.appId === input.appId && r.status === "running");
+      if (runningRuns.length > 0) {
+        return errorResult(
+          `app_uninstall: app "${input.appId}" has running app_run(s) ${runningRuns.map((r) => r.appRunId).join(", ")} \u2014 stop app runs first.`
+        );
+      }
+      const removed = appRegistry.removeApp(input.appId);
+      if (!removed) {
+        return errorResult(`app_uninstall: no installed app "${input.appId}".`);
+      }
+      return textResult({ appId: removed.appId });
+    }
+  );
+  server.tool(
+    "app_catalog",
+    "List browsable apps from the catalog file (default `~/.agentproto/app-catalog.json`, tolerates a missing file), merged with installed-app status \u2014 every entry reports `installed` and `hasUi`. Installed apps absent from the catalog file are included too.",
+    {
+      scopeId: z.string().optional().describe("Reserved for future scope-aware filtering. Currently unused.")
+    },
+    async () => {
+      const catalog = await loadAppCatalogFile(opts.catalogPath);
+      const installedApps = appRegistry.listApps();
+      const installedById = new Map(installedApps.map((a) => [a.appId, a]));
+      const seen = /* @__PURE__ */ new Set();
+      const entries = catalog.apps.map((entry) => {
+        const installed = installedById.get(entry.appId);
+        seen.add(entry.appId);
+        const name = entry.name ?? installed?.name;
+        const description = entry.description ?? installed?.description;
+        return {
+          appId: entry.appId,
+          ...name ? { name } : {},
+          ...description ? { description } : {},
+          dir: entry.dir,
+          ...entry.category ? { category: entry.category } : {},
+          installed: installed !== void 0,
+          hasUi: installed?.ui !== void 0
+        };
+      });
+      for (const app of installedApps) {
+        if (seen.has(app.appId)) continue;
+        entries.push({
+          appId: app.appId,
+          ...app.name ? { name: app.name } : {},
+          ...app.description ? { description: app.description } : {},
+          dir: app.dir,
+          installed: true,
+          hasUi: app.ui !== void 0
+        });
+      }
+      return textResult(entries);
+    }
+  );
+}
+function appUiToolId(appId) {
+  const slug = appId.replace(/^@[^/]+\//, "").replace(/[^a-z0-9]/g, "_");
+  return `app_ui_${slug}`;
+}
+function createUiHtmlCache() {
+  const cache = /* @__PURE__ */ new Map();
+  return {
+    async get(path, version) {
+      const cached = cache.get(path);
+      if (cached && cached.version === version) return cached.html;
+      const html = await readFile(path, "utf8");
+      cache.set(path, { version, html });
+      return html;
+    }
+  };
+}
+async function makeInstalledAppUiApps(appRegistry, cache, existingToolNames) {
+  const apps = [];
+  const seen = new Set(existingToolNames);
+  for (const app of appRegistry.listApps()) {
+    const ui = app.ui;
+    if (!ui) continue;
+    const toolId = appUiToolId(app.appId);
+    if (seen.has(toolId)) {
+      console.warn(
+        `[app-ui-apps] skipping UI panel for app "${app.appId}": tool id "${toolId}" collides with an existing tool or another installed app's panel.`
+      );
+      continue;
+    }
+    let html;
+    try {
+      html = await cache.get(ui.path, app.updatedAt);
+    } catch (err) {
+      console.warn(
+        `[app-ui-apps] skipping UI panel for app "${app.appId}": could not read "${ui.path}": ${err instanceof Error ? err.message : String(err)}`
+      );
+      continue;
+    }
+    seen.add(toolId);
+    apps.push({
+      id: toolId,
+      title: ui.title ?? app.name ?? app.appId,
+      ...ui.description ? { description: ui.description } : {},
+      inputSchema: z.object({}),
+      execute: async () => ({ appId: app.appId, tools: ui.tools ?? [] }),
+      html,
+      ...ui.csp ? {
+        csp: {
+          ...ui.csp.connectDomains ? { connectDomains: [...ui.csp.connectDomains] } : {},
+          ...ui.csp.resourceDomains ? { resourceDomains: [...ui.csp.resourceDomains] } : {}
+        }
+      } : {}
+    });
+  }
+  return apps;
 }
 function createSessionEventBus() {
   const ee = new EventEmitter();
@@ -29211,7 +29576,8 @@ function registerDaemonHealthTools(server, opts) {
         resumeSessionsOnBoot: opts.resumeSessionsOnBoot,
         idleReapAfterMs: opts.idleReapAfterMs,
         crashDetectIntervalMs: opts.crashDetectIntervalMs ?? 0,
-        restartSweepIntervalMs: opts.restartSweepIntervalMs ?? 0
+        restartSweepIntervalMs: opts.restartSweepIntervalMs ?? 0,
+        turnStallAfterMs: opts.turnStallAfterMs ?? 0
       });
     }
   );
@@ -31356,6 +31722,7 @@ async function isAgentCliAuthConfigured(slug, descriptor, model) {
 
 // src/index.ts
 var DEFAULT_CRASH_DETECT_INTERVAL_MS = 3e4;
+var DEFAULT_TURN_STALL_AFTER_MS = 5 * 6e4;
 var DEFAULT_ALWAYS_ON_TOOLS = [
   "daemon_health",
   "agent_start",
@@ -31366,7 +31733,8 @@ var DEFAULT_ALWAYS_ON_TOOLS = [
   "session_monitor",
   "session_events_poll",
   "permissions_list",
-  "permissions_respond"
+  "permissions_respond",
+  "app_tool_call"
 ];
 async function createGateway(opts) {
   const startedAt = Date.now();
@@ -31374,6 +31742,7 @@ async function createGateway(opts) {
   const idleReapAfterMs = typeof opts.idleReapAfterMs === "number" && opts.idleReapAfterMs > 0 ? opts.idleReapAfterMs : 0;
   const crashDetectIntervalMs = typeof opts.crashDetectIntervalMs === "number" ? opts.crashDetectIntervalMs > 0 ? opts.crashDetectIntervalMs : 0 : DEFAULT_CRASH_DETECT_INTERVAL_MS;
   const restartSweepIntervalMs = typeof opts.restartSweepIntervalMs === "number" && opts.restartSweepIntervalMs > 0 ? opts.restartSweepIntervalMs : 0;
+  const turnStallAfterMs = typeof opts.turnStallAfterMs === "number" ? opts.turnStallAfterMs > 0 ? opts.turnStallAfterMs : 0 : DEFAULT_TURN_STALL_AFTER_MS;
   const workspace = resolve(opts.workspace);
   if (!existsSync(workspace)) {
     throw new Error(`runtime: workspace dir does not exist: ${workspace}`);
@@ -31550,7 +31919,8 @@ async function createGateway(opts) {
     cronScheduler,
     dispatchTool
   });
-  const appRegistry = createAppRegistry();
+  const appRegistry = createAppRegistry({ persist });
+  const appUiHtmlCache = createUiHtmlCache();
   const workflowRunner = opts.resolveAgentAdapter ? createWorkflowRunner({
     registry: sessions,
     sessionEvents,
@@ -31671,7 +32041,7 @@ async function createGateway(opts) {
     ...opts.listAgentAdapters ? { listAgentAdapters: opts.listAgentAdapters } : {},
     ...opts.listHarnessCapabilities ? { listHarnessCapabilities: opts.listHarnessCapabilities } : {}
   });
-  const mcpServerFactory = async (denyTools, callerSessionId) => {
+  const mcpServerFactory = async (denyTools, callerSessionId, origin) => {
     const { server: rawServer } = await createMcpServer({
       specs: opts.specs,
       workspace,
@@ -31690,7 +32060,8 @@ async function createGateway(opts) {
       resumeSessionsOnBoot: opts.resumeSessionsOnBoot === true,
       idleReapAfterMs,
       crashDetectIntervalMs,
-      restartSweepIntervalMs
+      restartSweepIntervalMs,
+      turnStallAfterMs
     });
     registerCommandTools(server, {
       workspace,
@@ -31714,6 +32085,9 @@ async function createGateway(opts) {
       // a spawn made by an agent session attaches under it by default (see
       // spawn-attach.ts). Absent on a human/root `/mcp` call → no auto-parent.
       ...callerSessionId ? { callerSessionId } : {},
+      // `?origin=` query (#session-visibility) — the connecting client's source
+      // label, used as the default origin for a spawn that doesn't set its own.
+      ...origin ? { mcpBridgeOrigin: origin } : {},
       webhookNotifier,
       daemonMcpUrl,
       resolveSandboxProvider: resolveSandboxProviderResolved,
@@ -31753,6 +32127,16 @@ async function createGateway(opts) {
       registry: sessions,
       listRegisteredToolIds,
       appRegistry,
+      dispatchTool,
+      // Same proxy `mcp_imported_call` (session-tools.ts) dispatches
+      // through — unwraps `{ok,result}|{ok:false,error}` into a plain
+      // return-or-throw for `app_tool_call`'s `imported:<alias>/<toolName>`
+      // ids.
+      callImportedTool: async (alias, tool, args) => {
+        const out = await mcpProxy.callTool(alias, tool, args);
+        if (!out.ok) throw new Error(`app_tool_call: imported "${alias}".${tool}: ${out.error}`);
+        return out.result;
+      },
       ...opts.resolveAgentAdapter ? { resolveAgentAdapter: opts.resolveAgentAdapter } : {},
       ...workflowRunner ? { workflowRunner } : {}
     });
@@ -31764,7 +32148,7 @@ async function createGateway(opts) {
       }
       return rows;
     };
-    registerMcpApps(server, [
+    const builtinPanelApps = [
       makeSessionsPanelApp({ listSessions: listSessionsFiltered }),
       makeAgentsOverviewApp({ listSessions: listSessionsFiltered }),
       makeBureauSessionsApp({ listSessions: listSessionsFiltered }),
@@ -31814,7 +32198,13 @@ async function createGateway(opts) {
           }
         })
       ] : []
-    ]);
+    ];
+    const installedAppUiApps = await makeInstalledAppUiApps(
+      appRegistry,
+      appUiHtmlCache,
+      new Set(builtinPanelApps.map((app) => app.id))
+    );
+    registerMcpApps(server, [...builtinPanelApps, ...installedAppUiApps]);
     registerSummarizeSessionTool(server, {
       getSession: (id) => sessions.get(id),
       tailLines: (id, lastN) => {
@@ -31967,7 +32357,8 @@ async function createGateway(opts) {
       resumeSessionsOnBoot: opts.resumeSessionsOnBoot === true,
       idleReapAfterMs,
       crashDetectIntervalMs,
-      restartSweepIntervalMs
+      restartSweepIntervalMs,
+      turnStallAfterMs
     },
     cronScheduler,
     routineRegistrar
@@ -32012,6 +32403,27 @@ async function createGateway(opts) {
     }, crashDetectIntervalMs);
     crashDetectTimer.unref?.();
   }
+  let turnStallTimer = null;
+  if (turnStallAfterMs > 0) {
+    const rawInterval = process.env.AGENTPROTO_TURN_STALL_INTERVAL_MS;
+    const parsedInterval = rawInterval ? Number.parseInt(rawInterval, 10) : NaN;
+    const intervalMs = Number.isFinite(parsedInterval) && parsedInterval > 0 ? parsedInterval : Math.min(turnStallAfterMs, 6e4);
+    turnStallTimer = setInterval(() => {
+      try {
+        const summary = runStallWatchdogPass({ registry: sessions, turnStallAfterMs });
+        if (summary.stalled > 0) {
+          console.log(
+            `[stall-watchdog] flagged ${summary.stalled}/${summary.candidates} stalled agent session(s): ${summary.ids.join(", ")}`
+          );
+        }
+      } catch (err) {
+        console.warn(
+          `[stall-watchdog] sweep failed: ${err instanceof Error ? err.message : String(err)}`
+        );
+      }
+    }, intervalMs);
+    turnStallTimer.unref?.();
+  }
   let restartSweepTimer = null;
   if (restartSweepIntervalMs > 0) {
     restartSweepTimer = setInterval(() => {
@@ -32072,6 +32484,7 @@ async function createGateway(opts) {
       heartbeat.stop();
       if (idleReapTimer) clearInterval(idleReapTimer);
       if (crashDetectTimer) clearInterval(crashDetectTimer);
+      if (turnStallTimer) clearInterval(turnStallTimer);
       if (restartSweepTimer) clearInterval(restartSweepTimer);
       restartScheduler.dispose();
       inboundWatcher?.shutdown();
@@ -32131,6 +32544,6 @@ var export_providersPath = providers_store_exports.providersPath;
 var export_removeProviderKey = providers_store_exports.removeProviderKey;
 var export_setProviderKey = providers_store_exports.setProviderKey;
 
-export { AnthropicRemainingQuotaReader, AuthResolutionError, BUCKETS_ROOT, CLAUDE_CODE_OAUTH_SOURCE, DEFAULT_BUCKET, DEFAULT_ORCHESTRATOR_TOOLS, DEFAULT_WORKTREE_ISOLATION, INBOUND_PROVIDERS, LEGACY_SESSIONS_FILE, PAIRINGS_VERSION, POSTURE_NATIVE_ALIASES, POSTURE_PREAMBLES, export_PROVIDER_ENV_VARS as PROVIDER_ENV_VARS, ResumeDisabledError, SESSION_ID_ENV, SubscriptionSourceError, TASK_STATUSES, WORKSPACE_SLUG_ENV, WORKTREE_ISOLATION_ENV, activityCounts, appendConversationRecord, attachSandbox, bucketDir, bucketSessionsFile, bucketTranscriptDir, buildCatalogModels, buildCatalogProviderModels, buildMcpConfigSnippet, buildRouteAwareLaunchConfig, canonicalForModeId, claudeProjectSlug, composeMode, composeSessionObservers, conversationIndexPath, createActivityProjector, createFileStepCache, createGateway, createInboundEndpointStore, createOrchestratorInjector, createOrchestratorMcpServerFactory, createPairingRegistry, createPrProvenanceReconciler, createReconnectLogGate, createScopeTokenRegistry, createSupervisorTaskGateRunner, createTaskLedger, createWorkspaceFs, credentialFingerprint, daemonRegistryDir, decideWorktreeIsolation, declaredPresetToProviderPreset, decomposeMode, deleteUserPreset, deriveSessionUsage, enrichRollupWithProviderQuota, enrichWithRemainingQuota, evaluateCostBudget, fileConversationStore, filterActivities, findConversationRecord, findNativeMode, formatToolCall, formatToolResult, getMcpCredentialDeps, export_getProviderKey as getProviderKey, getUserPreset, export_injectProviderKeysIntoEnv as injectProviderKeysIntoEnv, isAgentCliAuthConfigured, isClosedTaskStatus, isSafeBucketSlug, isTerminalActivityState, listBuckets, listPresets, listUserPresets, export_loadProviders as loadProviders, loadQuotaStore, loadUserPresets, loadWorktreeIsolation, locateConversationByNativePath, locateConversationBySessionId, makeBrowserAdapterLister, migrateLegacySessionsFile, migrationMarkerPath, monitorPolicyWait, monitorSessionWait, narrowOrchestratorTools, normalizeInbound, normalizeModeId, normalizeSkillsOption, normalizeWorktreeField, parseAnthropicRateLimitHeaders, parseDuration, parseTaskStatus, parseWindow, parseWorktreeIsolationMode, policyToActivities, policyWatchesSession, prToActivities, projectSessionUsage, export_providerEnvVar as providerEnvVar, export_providersPath as providersPath, readConversationIndex, readDaemonRegistry, readProfileQuota, readRegisteredSlugs, readRuntimeMeta, readUsageSnapshots, reapOrphanedDescendants, recordProfileQuota, registerBuiltinRoutes, registerPairingTools, registerSandboxAttachTool, export_removeProviderKey as removeProviderKey, resolveAuthSpec, resolveBucketSlug, resolveNativeLink, resolvePosture, resolveSpawnDefaults, resolveSubscriptionCredential, rollupUsage, runCrashDetectPass, runEagerResumePass, runIdleReapPass, saveUserPreset, setMcpCredentialDeps, export_setProviderKey as setProviderKey, sweepStaleDaemonRegistry, sweepStaleRuntimeMetas, toWorktreeStatusView, turnToActivities, unlinkDaemonRegistryEntry, unlinkRuntimeMeta, userPresetsPath, verifyInboundSignature, workflowToActivities, writeDaemonRegistryEntry };
+export { AnthropicRemainingQuotaReader, AuthResolutionError, BUCKETS_ROOT, CLAUDE_CODE_OAUTH_SOURCE, DEFAULT_BUCKET, DEFAULT_ORCHESTRATOR_TOOLS, DEFAULT_WORKTREE_ISOLATION, INBOUND_PROVIDERS, LEGACY_SESSIONS_FILE, PAIRINGS_VERSION, POSTURE_NATIVE_ALIASES, POSTURE_PREAMBLES, export_PROVIDER_ENV_VARS as PROVIDER_ENV_VARS, ResumeDisabledError, SESSION_ID_ENV, SubscriptionSourceError, TASK_STATUSES, WORKSPACE_SLUG_ENV, WORKTREE_ISOLATION_ENV, activityCounts, appendConversationRecord, attachSandbox, bucketDir, bucketSessionsFile, bucketTranscriptDir, buildCatalogModels, buildCatalogProviderModels, buildMcpConfigSnippet, buildRouteAwareLaunchConfig, canonicalForModeId, claudeProjectSlug, composeMode, composeSessionObservers, conversationIndexPath, createActivityProjector, createFileStepCache, createGateway, createInboundEndpointStore, createOrchestratorInjector, createOrchestratorMcpServerFactory, createPairingRegistry, createPrProvenanceReconciler, createReconnectLogGate, createScopeTokenRegistry, createSupervisorTaskGateRunner, createTaskLedger, createWorkspaceFs, credentialFingerprint, daemonRegistryDir, decideWorktreeIsolation, declaredPresetToProviderPreset, decomposeMode, deleteUserPreset, deriveSessionUsage, enrichRollupWithProviderQuota, enrichWithRemainingQuota, evaluateCostBudget, fileConversationStore, filterActivities, findConversationRecord, findNativeMode, formatToolCall, formatToolResult, getMcpCredentialDeps, export_getProviderKey as getProviderKey, getUserPreset, export_injectProviderKeysIntoEnv as injectProviderKeysIntoEnv, isAgentCliAuthConfigured, isClosedTaskStatus, isSafeBucketSlug, isTerminalActivityState, listBuckets, listPresets, listUserPresets, export_loadProviders as loadProviders, loadQuotaStore, loadUserPresets, loadWorktreeIsolation, locateConversationByNativePath, locateConversationBySessionId, makeBrowserAdapterLister, migrateLegacySessionsFile, migrationMarkerPath, monitorPolicyWait, monitorSessionWait, narrowOrchestratorTools, normalizeInbound, normalizeModeId, normalizeSkillsOption, normalizeWorktreeField, parseAnthropicRateLimitHeaders, parseDuration, parseTaskStatus, parseWindow, parseWorktreeIsolationMode, policyToActivities, policyWatchesSession, prToActivities, projectSessionUsage, export_providerEnvVar as providerEnvVar, export_providersPath as providersPath, readConversationIndex, readDaemonRegistry, readProfileQuota, readRegisteredSlugs, readRuntimeMeta, readUsageSnapshots, reapOrphanedDescendants, recordProfileQuota, registerBuiltinRoutes, registerPairingTools, registerSandboxAttachTool, export_removeProviderKey as removeProviderKey, resolveAuthSpec, resolveBucketSlug, resolveNativeLink, resolvePosture, resolveSpawnDefaults, resolveSubscriptionCredential, rollupUsage, runCrashDetectPass, runEagerResumePass, runIdleReapPass, runStallWatchdogPass, saveUserPreset, setMcpCredentialDeps, export_setProviderKey as setProviderKey, sweepStaleDaemonRegistry, sweepStaleRuntimeMetas, toWorktreeStatusView, turnToActivities, unlinkDaemonRegistryEntry, unlinkRuntimeMeta, userPresetsPath, verifyInboundSignature, workflowToActivities, writeDaemonRegistryEntry };
 //# sourceMappingURL=index.mjs.map
 //# sourceMappingURL=index.mjs.map