@danieltmn/tamnora 0.16.1 → 0.18.0

package/harness/packages/server/public/index.html

@@ -37,7 +37,7 @@
   </head>
   <body>
     <header class="topbar">
-      <div class="brand"><span class="logo"><img src="/icons/logo.png" alt="Tamnora" /></span> <span id="topbar-section" class="topbar-section">chat</span> <span class="ver">v0.16.1</span></div>
+      <div class="brand"><span class="logo"><img src="/icons/logo.png" alt="Tamnora" /></span> <span id="topbar-section" class="topbar-section">chat</span> <span class="ver">v0.18.0</span></div>
       <nav class="tabs">
         <button class="tab active" data-tab="chat">chat</button>
         <button class="tab" data-tab="providers">proveedores</button>
@@ -209,6 +209,9 @@
               <button class="send-btn" type="submit" aria-label="enviar" title="enviar">
                 <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.9" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="m5 12 7-7 7 7" /><path d="M12 19V5" /></svg>
               </button>
+              <button class="add-btn interrupt-btn" type="button" id="interrupt-btn" title="Interrumpir al agente y enviar este mensaje (Ctrl+Enter)" aria-label="interrumpir y enviar" hidden>
+                <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M13 2 3 14h9l-1 8 10-12h-9l1-8z" /></svg>
+              </button>
               <button class="add-btn" type="button" id="stop-btn" title="Detener la respuesta" aria-label="detener" hidden>
                 <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><rect x="6" y="6" width="12" height="12" rx="2" /></svg>
               </button>
@@ -267,7 +270,12 @@
             <div class="xp-bar">
               <input id="preview-url" placeholder="http://127.0.0.1:5173" spellcheck="false" />
               <button id="preview-open" class="btn" type="button">abrir</button>
-              <button id="preview-tunnel" class="btn" type="button" title="Abrir un túnel público al puerto (para el celular)">túnel</button>
+              <select id="preview-provider" title="cómo exponer el puerto para acceso remoto" aria-label="proveedor de acceso remoto">
+                <option value="tailscale">tailscale</option>
+                <option value="tunnelmole">público</option>
+              </select>
+              <button id="preview-tunnel" class="btn" type="button" title="Exponer el puerto para acceso remoto (tailscale privado o túnel público)">túnel</button>
+              <button id="preview-close" class="btn danger" type="button" hidden title="Cerrar el túnel/exposición remota">cerrar</button>
             </div>
             <div class="preview-tools">
               <select id="preview-device" title="tamaño de pantalla" aria-label="tamaño de pantalla">
@@ -561,12 +569,36 @@
           <p class="muted verify-line">
             Se combinan con <code>mcp[]</code> de <code>tamnora.json</code>; los guardados acá viven en la base.
           </p>
+          <div class="import-bar">
+            <label class="field grow"><span>carga de herramientas MCP</span>
+              <select id="mcp-mode">
+                <option value="auto">auto (diferir si hay muchas)</option>
+                <option value="lazy">diferido (índice + mcp_call)</option>
+                <option value="eager">completas (todas en cada turno)</option>
+              </select>
+            </label>
+            <span id="mcp-count" class="muted"></span>
+          </div>
+          <div class="import-bar">
+            <input id="mcp-pinned" placeholder="tools/servidores fijos (coma), ej. mcp__postgres__query" spellcheck="false" />
+            <button id="mcp-pinned-save" class="btn" type="button">fijar</button>
+          </div>
           <div class="import-bar">
             <input id="mcp-import" placeholder="nombre del registro oficial, URL o JSON (bloque mcpServers)" spellcheck="false" />
             <button id="mcp-import-btn" class="btn" type="button">importar</button>
           </div>
+          <div class="import-bar">
+            <input id="mcp-search" placeholder="buscar en el registro oficial (ej. github, postgres)" spellcheck="false" />
+            <button id="mcp-search-btn" class="btn" type="button">buscar</button>
+          </div>
           <div id="mcp-import-status" class="summary"></div>
+          <div id="mcp-search-status" class="summary"></div>
+          <ul id="mcp-search-results" class="providers"></ul>
           <ul id="mcp-list" class="providers"></ul>
+          <details class="catalog">
+            <summary>sugeridos</summary>
+            <ul id="mcp-catalog" class="providers"></ul>
+          </details>
         </div>
 
         <div class="panel ajustes-panel" data-panel="skills">
@@ -581,8 +613,18 @@
             <input id="skill-import" placeholder="https://skills.sh/owner/repo/skill" spellcheck="false" />
             <button id="skill-import-btn" class="btn" type="button">importar</button>
           </div>
+          <div class="import-bar">
+            <input id="skill-search" placeholder="buscar skills en GitHub (ej. testing, react)" spellcheck="false" />
+            <button id="skill-search-btn" class="btn" type="button">buscar</button>
+          </div>
           <div id="skill-import-status" class="summary"></div>
+          <div id="skill-search-status" class="summary"></div>
+          <ul id="skill-search-results" class="providers"></ul>
           <ul id="skill-list" class="providers"></ul>
+          <details class="catalog">
+            <summary>sugeridas</summary>
+            <ul id="skill-catalog" class="providers"></ul>
+          </details>
         </div>
 
         <div class="panel ajustes-panel" data-panel="memoria">

package/harness/packages/server/public/styles.css

@@ -15,6 +15,12 @@
   --accent-soft: rgba(217, 112, 74, 0.18);
   --ok: #8fae7f;
   --warn: #d9a441;
+  --info: #6f9fd8;
+  --danger-soft: rgba(224, 112, 92, 0.16);
+  --ok-soft: rgba(143, 174, 127, 0.16);
+  --warn-soft: rgba(217, 164, 65, 0.16);
+  --info-soft: rgba(111, 159, 216, 0.16);
+  --muted-soft: rgba(156, 151, 137, 0.14);
   --solid: #12130b;
   --primary-fg: #fff7ef;
   --sans: Manrope, system-ui, "Segoe UI", Arial, sans-serif;
@@ -46,6 +52,12 @@ html[data-theme='paper'] {
   --accent-soft: rgba(189, 84, 47, 0.1);
   --ok: #66865d;
   --warn: #8a5a00;
+  --info: #3f6ea6;
+  --danger-soft: rgba(147, 64, 34, 0.1);
+  --ok-soft: rgba(102, 134, 93, 0.14);
+  --warn-soft: rgba(138, 90, 0, 0.12);
+  --info-soft: rgba(63, 110, 166, 0.12);
+  --muted-soft: rgba(104, 104, 93, 0.12);
   --solid: #f7f2e6;
   --primary-fg: #fbf6ec;
   --page-bg: #f5efe2;
@@ -820,6 +832,60 @@ body.resizing * { cursor: col-resize !important; }
 .perm-card.collapsed .perm-args,
 .perm-card.collapsed .perm-actions { display: none; }
 
+/* question card (ask_user) ------------------------------------------------- */
+.question-card {
+  border: 1px solid var(--accent);
+  border-radius: 8px;
+  padding: 10px 12px;
+  background: var(--accent-soft);
+}
+.question-title { font-weight: 700; margin-bottom: 8px; }
+.question-form { display: flex; flex-direction: column; gap: 9px; }
+.question-field { display: flex; flex-direction: column; gap: 4px; }
+.question-label { font-size: 12.5px; color: var(--muted); }
+.question-input {
+  font: inherit;
+  color: var(--text);
+  background: var(--theirs);
+  border: 1px solid var(--border);
+  border-radius: 6px;
+  padding: 6px 8px;
+}
+.question-input:focus { outline: none; border-color: var(--accent); }
+.question-actions { display: flex; align-items: center; gap: 8px; margin-top: 2px; }
+.question-actions .spacer { flex: 1; }
+.question-card.answered { border-color: var(--ok); background: var(--ok-soft); }
+.question-card.answered .question-title { color: var(--ok); }
+
+/* choice card (offer_choices) ---------------------------------------------- */
+.choice-card {
+  border: 1px solid var(--border);
+  border-radius: 8px;
+  padding: 10px 12px;
+  background: var(--theirs);
+  margin-top: 6px;
+}
+.choice-question { margin-bottom: 8px; }
+.choice-options { display: flex; flex-wrap: wrap; gap: 6px; }
+.choice-btn { border-radius: 999px; padding: 5px 12px; }
+
+/* plan card (show_plan) ---------------------------------------------------- */
+.plan-card {
+  border: 1px solid var(--border);
+  border-radius: 8px;
+  padding: 10px 12px;
+  background: var(--theirs);
+  margin-top: 6px;
+}
+.plan-title { font-weight: 700; margin-bottom: 6px; }
+.plan-steps { list-style: none; margin: 0; padding: 0; display: flex; flex-direction: column; gap: 4px; }
+.plan-step { display: flex; align-items: baseline; gap: 8px; line-height: 1.4; }
+.plan-mark { flex: none; width: 14px; font-family: var(--mono); color: var(--muted); }
+.plan-step.done .plan-mark { color: var(--ok); }
+.plan-step.done .plan-text { color: var(--muted); text-decoration: line-through; }
+.plan-step.active .plan-mark { color: var(--accent); }
+.plan-step.active .plan-text { color: var(--text); font-weight: 600; }
+
 /* activity indicators ------------------------------------------------------ */
 .activity { display: flex; align-items: center; gap: 9px; margin-top: 10px; color: var(--muted); font-size: 12.5px; }
 .activity .loader { color: var(--accent); }
@@ -1018,6 +1084,10 @@ details.reasoning .body { color: var(--muted); white-space: pre-wrap; margin-top
 .send-btn:hover { filter: brightness(1.08); }
 .send-btn:disabled { opacity: 0.5; cursor: default; }
 .send-btn[data-working="1"] { background: var(--theirs); color: var(--accent); border-color: var(--accent); }
+/* Interrumpir: corta el turno en curso y manda el mensaje ya. */
+.interrupt-btn { color: var(--accent); border-color: var(--accent); }
+.interrupt-btn:hover { background: var(--accent); color: var(--primary-fg); }
+.interrupt-btn:disabled { opacity: 0.45; cursor: default; color: var(--muted); border-color: var(--border); }
 /* Dictado activo: verde titilando (cuenta regresiva y grabación). */
 .add-btn.recording { color: #2eb872; border-color: currentColor; animation: live-pulse 1s ease-in-out infinite; }
 .add-btn.busy { opacity: 0.55; }
@@ -1407,8 +1477,8 @@ pre.code code { background: none; border: 0; padding: 0; font-size: 0.92em; }
 .explorer-head { display: flex; align-items: center; gap: 6px; padding: 9px 12px; border-bottom: 1px solid var(--border); min-width: 0; }
 .explorer-title { font: 700 14px var(--serif); letter-spacing: -0.02em; }
 .explorer-head .spacer { flex: 1; }
-/* Los botones de accion (refrescar/cerrar) nunca se recortan: las pestanas se
-   angostan y hacen scroll horizontal en vez de empujarlos fuera del panel. */
+/* Los botones de accion (refrescar/cerrar) nunca se recortan: las pestanas
+   bajan a una segunda fila (wrap) en vez de empujarlos fuera o desaparecer. */
 .explorer-head .btn.icon { flex: 0 0 auto; }
 .explorer-cwd { padding: 9px 12px 0; color: var(--muted); font: 500 11px var(--mono); word-break: break-all; }
 .explorer-cwd:empty { display: none; }
@@ -1430,13 +1500,12 @@ pre.code code { background: none; border: 0; padding: 0; font-size: 0.92em; }
 .explorer-status { padding: 6px 12px; border-top: 1px solid var(--border); color: var(--muted); font: 500 11px var(--mono); min-height: 27px; }
 .explorer-status.err { color: var(--danger); }
 
-.xtabs { display: flex; gap: 4px; min-width: 0; flex: 0 1 auto; overflow-x: auto; scrollbar-width: none; }
-.xtabs::-webkit-scrollbar { display: none; }
+.xtabs { display: flex; flex-wrap: wrap; gap: 4px; min-width: 0; flex: 0 1 auto; }
 .xtab { flex: 0 0 auto; border: 0; background: none; color: var(--muted); cursor: pointer; font: 600 12px var(--sans); padding: 4px 7px; border-radius: 7px; }
 .xtab:hover { background: var(--theirs); color: var(--text); }
 .xtab.is-active { background: var(--theirs); color: var(--text); }
 .xp-pane { display: flex; flex-direction: column; flex: 1; min-height: 0; }
-.xp-bar { display: flex; gap: 6px; align-items: center; padding: 9px 12px; }
+.xp-bar { display: flex; flex-wrap: wrap; gap: 6px; align-items: center; padding: 9px 12px; }
 .xp-bar input { flex: 1; min-width: 0; }
 .xp-bar .grow { flex: 1; min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
 .chips { display: flex; flex-wrap: wrap; gap: 6px; padding: 0 12px 8px; }
@@ -1495,6 +1564,16 @@ pre.code code { background: none; border: 0; padding: 0; font-size: 0.92em; }
 .import-bar { display: flex; gap: 6px; margin: 4px 0 10px; }
 .import-bar input { flex: 1; min-width: 0; }
 
+details.catalog { margin: 10px 0; }
+details.catalog > summary {
+  cursor: pointer;
+  font: 600 11px var(--mono);
+  letter-spacing: 0.06em;
+  text-transform: uppercase;
+  color: var(--muted);
+}
+details.catalog[open] > summary { margin-bottom: 6px; }
+
 .file-actions { display: flex; align-items: center; gap: 10px; }
 .file-modal { width: min(880px, calc(100vw - 40px)); }
 .file-preview {
@@ -1947,9 +2026,29 @@ dialog.modal::backdrop { background: rgba(24, 22, 16, 0.55); backdrop-filter: bl
 .advisor-head { display: flex; align-items: center; gap: 8px; margin-bottom: 4px; }
 .advisor-glyph { color: var(--accent); font-size: 13px; line-height: 1; }
 .advisor-title { font: 600 10px var(--mono); letter-spacing: 0.08em; text-transform: uppercase; color: var(--muted); }
+.advisor-badge {
+  font: 600 10px var(--mono);
+  letter-spacing: 0.04em;
+  text-transform: uppercase;
+  padding: 1px 7px;
+  border-radius: 999px;
+  color: var(--accent);
+  background: var(--accent-soft);
+  border: 1px solid currentColor;
+}
 .advisor-text { color: var(--text); line-height: 1.5; }
-.advisor-code { border-left-color: var(--warn); }
-.advisor-code .advisor-glyph { color: var(--warn); }
+.advisor-code { border-left-color: var(--danger); background: var(--danger-soft); }
+.advisor-code .advisor-glyph,
+.advisor-code .advisor-badge { color: var(--danger); }
+.advisor-explain { border-left-color: var(--info); background: var(--info-soft); }
+.advisor-explain .advisor-glyph,
+.advisor-explain .advisor-badge { color: var(--info); }
+.advisor-advice { border-left-color: var(--ok); background: var(--ok-soft); }
+.advisor-advice .advisor-glyph,
+.advisor-advice .advisor-badge { color: var(--ok); }
+.advisor-summary { border-left-color: var(--muted); background: var(--muted-soft); }
+.advisor-summary .advisor-glyph,
+.advisor-summary .advisor-badge { color: var(--muted); }
 
 .brand .ver.ver-action { cursor: pointer; }
 .brand .ver.ver-action:hover { color: var(--accent); }

package/harness/packages/server/src/lib/agentTools.js

@@ -7,11 +7,15 @@ import {
   parseSkillMarkdown,
   parseSkillRef,
   fetchSkillFromGithub,
+  searchSkillsGithub,
   writeSkillFiles,
   getMcpRegistryServer,
   registryServerToConfig,
+  registryServerToCandidate,
+  searchMcpRegistry,
   normalizeMcpConfig,
   homeDir,
+  envValue,
   memorySlug,
   listMemoryTopics,
   readMemoryIndex,
@@ -37,6 +41,12 @@ function definition(name, description, parameters, required = []) {
 
 const DEFINITIONS = [
   definition('list_mcp', 'Lista los servidores MCP configurados (de tamnora.json y de la base).', {}),
+  definition(
+    'search_mcp',
+    'Busca servidores en el registro oficial de MCP y devuelve candidatos (id, nombre, descripción y env requerido) sin instalarlos. Para registrar uno, usá install_mcp con el nombre del registro.',
+    { query: { type: 'string', description: 'Texto a buscar, ej. "github" o "postgres"' } },
+    ['query']
+  ),
   definition(
     'install_mcp',
     'Registra un servidor MCP. stdio: pasá command (y args). http: pasá url. Para webs con JavaScript/Cloudflare (que fetch_url no lee) instalá un MCP de navegador, ej. command "npx" args ["-y","@playwright/mcp@latest"].',
@@ -57,6 +67,12 @@ const DEFINITIONS = [
   ),
   definition('remove_mcp', 'Elimina un servidor MCP guardado desde la consola.', { id: { type: 'string' } }, ['id']),
   definition('list_skills', 'Lista las skills instaladas y si están habilitadas.', {}),
+  definition(
+    'search_skills',
+    'Busca skills en GitHub y devuelve refs instalables (owner/repo/slug). Para instalarlas, usá install_skill con "ref".',
+    { query: { type: 'string', description: 'Texto a buscar, ej. "testing" o "react"' } },
+    ['query']
+  ),
   definition(
     'skill',
     'Carga el contenido completo de una skill por su id. Usala cuando una skill del índice aplique a la tarea.',
@@ -113,7 +129,7 @@ function decisionFor(ctx, name, args) {
   const value = perms[name];
   if (value === 'allow' || value === 'ask' || value === 'deny') return value;
   if (name === 'memory') return String(args?.action ?? 'read').toLowerCase() === 'write' ? 'ask' : 'allow';
-  return name.startsWith('list_') || name === 'skill' ? 'allow' : 'ask';
+  return name.startsWith('list_') || name.startsWith('search_') || name === 'skill' ? 'allow' : 'ask';
 }
 
 /**
@@ -144,6 +160,19 @@ export function createAgentTools(ctx) {
           source: s.source ?? 'config',
         })), null, 2);
 
+      case 'search_mcp': {
+        const query = String(args.query ?? '').trim();
+        if (!query) return 'Pasá "query" para buscar en el registro MCP.';
+        let servers;
+        try {
+          servers = await searchMcpRegistry(query, { limit: 10 });
+        } catch (error) {
+          return `No se pudo consultar el registro MCP: ${error.message}`;
+        }
+        if (!servers.length) return `Sin resultados para "${query}".`;
+        return JSON.stringify(servers.map(registryServerToCandidate), null, 2);
+      }
+
       case 'install_mcp': {
         if (args.registry || args.name) {
           let server;
@@ -223,6 +252,19 @@ export function createAgentTools(ctx) {
       case 'list_skills':
         return JSON.stringify(skillsView(ctx).map(({ id, name, enabled, description }) => ({ id, name, enabled, description })), null, 2);
 
+      case 'search_skills': {
+        const query = String(args.query ?? '').trim();
+        if (!query) return 'Pasá "query" para buscar skills.';
+        let results;
+        try {
+          results = await searchSkillsGithub(query, { token: envValue(['GITHUB_TOKEN', 'GH_TOKEN']) });
+        } catch (error) {
+          return `No se pudo buscar en GitHub: ${error.message}`;
+        }
+        if (!results.length) return `Sin resultados para "${query}".`;
+        return JSON.stringify(results, null, 2);
+      }
+
       case 'skill': {
         const id = String(args.name ?? args.id ?? '').trim();
         const skill = findSkill(ctx, id);
@@ -308,7 +350,7 @@ export function createAgentTools(ctx) {
     }
   }
 
-  // Tools de admin que no modifican nada (lístar/leer): disponibles en todo modo.
-  const readOnly = new Set(['list_mcp', 'list_skills', 'skill']);
+  // Tools de admin que no modifican nada (lístar/leer/buscar): disponibles en todo modo.
+  const readOnly = new Set(['list_mcp', 'search_mcp', 'list_skills', 'search_skills', 'skill']);
   return { definitions: DEFINITIONS, handles, execute, readOnly };
 }

package/harness/packages/server/src/lib/channels/telegram.js

@@ -474,6 +474,8 @@ export function startTelegramChannel(
       yes: false,
       onAsk,
       mcp,
+      mcpMode: ctx.effectiveMcpMode(),
+      mcpPinned: ctx.effectiveMcpPinned(),
     });
     const exposeAdmin = !mode.tools;
     const admin = ctx.agentTools;

package/harness/packages/server/src/lib/procs.js

@@ -36,11 +36,17 @@ export function createProcManager({ allow } = {}) {
   );
   const procs = new Map();
 
+  function allows(bin) {
+    const value = String(bin ?? '').trim();
+    if (!value) return false;
+    const base = path.basename(value).replace(/\.(exe|cmd|bat)$/i, '').toLowerCase();
+    return allowed.has(base) || allowed.has(value.toLowerCase());
+  }
+
   function start({ cwd, command, args = [], port } = {}) {
     const bin = String(command ?? '').trim();
     if (!bin) throw new Error('Falta el comando.');
-    const base = path.basename(bin).replace(/\.(exe|cmd|bat)$/i, '').toLowerCase();
-    if (!allowed.has(base) && !allowed.has(bin.toLowerCase())) {
+    if (!allows(bin)) {
       throw new Error(`Comando no permitido: ${bin}. Agregalo a processes.allow en tamnora.json.`);
     }
     const child = spawn(bin, args.map(String), {
@@ -106,5 +112,5 @@ export function createProcManager({ allow } = {}) {
     procs.clear();
   }
 
-  return { start, stop, list, logs, close, allowed: [...allowed] };
+  return { start, stop, list, logs, close, allows, allowed: [...allowed] };
 }

package/harness/packages/server/src/lib/prompt.js

@@ -33,11 +33,12 @@ function workspacePreamble(cwd) {
  * @param {string[]} opts.files - instruction file names (e.g. ['AGENTS.md'])
  * @param {() => string} [opts.profileText] - user profile block, re-read on every call
  * @param {() => string} [opts.skillsText] - skills block, re-read on every call
+ * @param {() => string} [opts.mcpText] - MCP tool index block, re-read on every call
  * @param {() => string} [opts.scopeText] - strict-scope block, re-read on every call
  * @param {string[]} [opts.ruleFiles] - glob patterns of project rule files
  * @param {boolean} [opts.memory] - inject the project memory block
  */
-export function createPromptBuilder({ cwd, files, profileText, skillsText, scopeText, ruleFiles = [], memory = false }) {
+export function createPromptBuilder({ cwd, files, profileText, skillsText, mcpText, scopeText, ruleFiles = [], memory = false }) {
   const cache = new Map();
 
   async function buildFor(workspace) {
@@ -60,6 +61,8 @@ export function createPromptBuilder({ cwd, files, profileText, skillsText, scope
     if (profile) parts.push(profile);
     const extra = typeof skillsText === 'function' ? String(skillsText() ?? '').trim() : '';
     if (extra) parts.push(extra);
+    const mcp = typeof mcpText === 'function' ? String(mcpText() ?? '').trim() : '';
+    if (mcp) parts.push(mcp);
     if (memory) {
       const mem = memoryPrompt(key);
       if (mem) parts.push(mem);

package/harness/packages/server/src/lib/questions.js

@@ -0,0 +1,72 @@
+/**
+ * Broker para formularios interactivos (`ask_user`). El chat registra un pedido
+ * pendiente (`ask`) y lo espera mientras el SSE emite un evento `question`; la
+ * consola responde con `POST /api/questions/:askId`, que llama a `answer`. Los
+ * pedidos que nadie contesta expiran como cancelados.
+ *
+ * Igual que `approvals`, guarda el `meta` (sessionId, title, questions) para que
+ * un cliente **sin** stream abierto sepa que hay un formulario esperando.
+ *
+ * @param {object} [opts]
+ * @param {number} [opts.timeoutMs] - how long to wait before cancelling
+ */
+export function createQuestionBroker({ timeoutMs = 900000 } = {}) {
+  const pending = new Map();
+
+  function settle(id, answers, ok) {
+    const entry = pending.get(id);
+    if (!entry) return false;
+    clearTimeout(entry.timer);
+    pending.delete(id);
+    entry.resolve({ ok, answers: answers ?? null });
+    return true;
+  }
+
+  return {
+    /** Register a pending form; resolves to `{ ok, answers }`. */
+    ask(id, meta = {}) {
+      return new Promise((resolve) => {
+        const timer = setTimeout(() => settle(id, null, false), timeoutMs);
+        timer.unref?.();
+        pending.set(id, { resolve, timer, requestedAt: Date.now(), ...meta });
+      });
+    },
+
+    /** Answer a pending form. Returns false if it expired or is unknown. */
+    answer(id, answers) {
+      return settle(id, answers, true);
+    },
+
+    /** Cancel every pending form of a session (used when the run stops). */
+    cancelForSession(sessionId) {
+      for (const [id, entry] of pending) {
+        if (entry.sessionId === sessionId) settle(id, null, false);
+      }
+    },
+
+    /** Cancel everything still pending (used on shutdown). */
+    cancelAll() {
+      for (const id of [...pending.keys()]) settle(id, null, false);
+    },
+
+    /** Lo que sigue esperando, para que cualquier cliente pueda mostrarlo. */
+    list({ sessionId } = {}) {
+      const items = [];
+      for (const [askId, entry] of pending) {
+        if (sessionId !== undefined && entry.sessionId !== sessionId) continue;
+        items.push({
+          askId,
+          sessionId: entry.sessionId ?? null,
+          title: entry.title ?? '',
+          questions: entry.questions ?? [],
+          requestedAt: entry.requestedAt,
+        });
+      }
+      return items.sort((a, b) => a.requestedAt - b.requestedAt);
+    },
+
+    get pending() {
+      return pending.size;
+    },
+  };
+}

package/harness/packages/server/src/lib/runManager.js

@@ -10,6 +10,15 @@
 export function createRunManager({ store }) {
   const runs = new Map();
   const listeners = new Set();
+  // Resolvers esperando a que el run de una sesion termine (`waitForIdle`).
+  const idleWaiters = new Map();
+
+  function settleIdle(sessionId) {
+    const waiters = idleWaiters.get(sessionId);
+    if (!waiters) return;
+    idleWaiters.delete(sessionId);
+    for (const resolve of waiters) resolve();
+  }
 
   function persist(run, sessionId, type, data, agentId) {
     const coalesce =
@@ -82,6 +91,7 @@ export function createRunManager({ store }) {
     run.subscribers.clear();
     runs.delete(sessionId);
     announce(sessionId, 'end', { durationMs: Date.now() - run.startedAt });
+    settleIdle(sessionId);
   }
 
   function cancel(sessionId) {
@@ -92,7 +102,24 @@ export function createRunManager({ store }) {
     const active = [...runs.values()];
     for (const run of active) run.controller.abort();
     runs.clear();
-    for (const run of active) announce(run.sessionId, 'end', { durationMs: Date.now() - run.startedAt, reason: 'shutdown' });
+    for (const run of active) {
+      announce(run.sessionId, 'end', { durationMs: Date.now() - run.startedAt, reason: 'shutdown' });
+      settleIdle(run.sessionId);
+    }
+  }
+
+  /**
+   * Promesa que resuelve cuando el run de la sesion ya no esta activo. Sirve
+   * para "interrumpir": cancelar el run actual y esperar a que se desenrolle
+   * antes de arrancar el siguiente (si no, `start` devuelve null y se pierde).
+   */
+  function waitForIdle(sessionId) {
+    if (!runs.has(sessionId)) return Promise.resolve();
+    return new Promise((resolve) => {
+      const waiters = idleWaiters.get(sessionId) ?? [];
+      waiters.push(resolve);
+      idleWaiters.set(sessionId, waiters);
+    });
   }
 
   function isActive(sessionId) {
@@ -120,5 +147,5 @@ export function createRunManager({ store }) {
     return () => listeners.delete(fn);
   }
 
-  return { emit, start, finish, cancel, cancelAll, isActive, signal, subscribe, subscribeAll, activeSessions };
+  return { emit, start, finish, cancel, cancelAll, isActive, waitForIdle, signal, subscribe, subscribeAll, activeSessions };
 }

package/harness/packages/server/src/lib/scheduler.js

@@ -53,7 +53,16 @@ async function runAgentSchedule(ctx, schedule) {
   ctx.store.addMessage(sessionId, userMessage);
   const prefixLength = messages.length;
 
-  const local = createTools({ root: cwd, enabled: mode.tools ?? undefined, permissions: ctx.config.permissions, yes: true, mcp, signal });
+  const local = createTools({
+    root: cwd,
+    enabled: mode.tools ?? undefined,
+    permissions: ctx.config.permissions,
+    yes: true,
+    mcp,
+    mcpMode: ctx.effectiveMcpMode(),
+    mcpPinned: ctx.effectiveMcpPinned(),
+    signal,
+  });
   const exposeAdmin = !mode.tools;
   const admin = ctx.agentTools;
   const emit = (type, data, agentId = null) => ctx.runs.emit(sessionId, type, data, { agentId });
@@ -64,6 +73,8 @@ async function runAgentSchedule(ctx, schedule) {
     model,
     permissions: ctx.config.permissions,
     mcp,
+    mcpMode: ctx.effectiveMcpMode(),
+    mcpPinned: ctx.effectiveMcpPinned(),
     signal,
     exclude: admin.definitions.map((d) => d.function.name),
     emit,

package/harness/packages/server/src/lib/tasks.js

@@ -32,6 +32,8 @@ export function createSubagentTool(ctx, options) {
     model,
     permissions = {},
     mcp = null,
+    mcpMode = 'auto',
+    mcpPinned = [],
     signal,
     exclude = [],
     emit,
@@ -67,7 +69,7 @@ export function createSubagentTool(ctx, options) {
       Array.isArray(args.tools) && args.tools.length
         ? args.tools.filter((tool) => !exclude.includes(tool))
         : mode.tools ?? undefined;
-    const local = createTools({ root: cwd, enabled, permissions, yes: false, mcp, signal });
+    const local = createTools({ root: cwd, enabled, permissions, yes: false, mcp, mcpMode, mcpPinned, signal });
     const basePrompt = await ctx.systemPromptFor(cwd);
     const messages = [
       { role: 'system', content: `${basePrompt}\n\n${SUBAGENT_PROMPT}\n\nTarea: ${description}` },