yaml-flow 5.2.1 → 5.2.5

package/board-livecards-server-runtime.js

@@ -527,7 +527,7 @@ export function createExampleBoardServerRuntime(options = {}) {
 
     for (const sourceDef of cardDefinition.sources) {
       if (!sourceDef || !sourceDef.bindTo || !sourceDef.outputFile) continue;
-      const filePath = path.join(boardDir, sourceDef.outputFile);
+      const filePath = path.join(boardDir, cardDefinition.id, sourceDef.outputFile);
       if (!fs.existsSync(filePath)) continue;
 
       const raw = fs.readFileSync(filePath, 'utf-8').trim();
@@ -563,13 +563,15 @@ export function createExampleBoardServerRuntime(options = {}) {
   function readChatSignal(cardId) {
     const chatsDir = path.join(tmpCardsDir, cardId, 'chats');
     if (!fs.existsSync(chatsDir)) {
-      return { count: 0, latest_mtime_ms: 0 };
+      return { count: 0, latest_mtime_ms: 0, processing: false };
     }
 
     let count = 0;
     let latestMtimeMs = 0;
+    let processing = false;
     for (const entry of fs.readdirSync(chatsDir, { withFileTypes: true })) {
       if (!entry.isFile()) continue;
+      if (entry.name === '.processing') { processing = true; continue; }
       count += 1;
       try {
         const st = fs.statSync(path.join(chatsDir, entry.name));
@@ -580,7 +582,7 @@ export function createExampleBoardServerRuntime(options = {}) {
       }
     }
 
-    return { count, latest_mtime_ms: latestMtimeMs };
+    return { count, latest_mtime_ms: latestMtimeMs, processing };
   }
 
   function buildPublishedRuntimePayload() {
@@ -642,6 +644,21 @@ export function createExampleBoardServerRuntime(options = {}) {
       fs.copyFileSync(src, dst);
     }
 
+    // Concatenate agent-instructions*.md files into copilot-instructions.md at boardSetupRoot
+    const boardSetupRoot = path.dirname(boardDir);
+    const agentInstructionFiles = ['agent-instructions.md', 'agent-instructions-cardlayout.md'];
+    const srcDir = path.dirname(cardsDir); // board source dir where agent-instructions*.md live
+    const parts = [];
+    for (const fname of agentInstructionFiles) {
+      const fpath = path.join(srcDir, fname);
+      if (fs.existsSync(fpath)) {
+        parts.push(fs.readFileSync(fpath, 'utf-8').trimEnd());
+      }
+    }
+    if (parts.length > 0) {
+      fs.writeFileSync(path.join(boardSetupRoot, 'copilot-instructions.md'), parts.join('\n\n') + '\n', 'utf-8');
+    }
+
     didDemoSetup = true;
   }
 
@@ -930,8 +947,9 @@ export function createExampleBoardServerRuntime(options = {}) {
       if (!entry.isFile()) continue;
       const name = entry.name;
       const parsed = String(name).match(/^(\d+)[-_]([a-z0-9_-]+)\.txt$/i);
-      const serial = parsed ? parseInt(parsed[1], 10) : 0;
-      const role = parsed ? parsed[2].toLowerCase() : 'system';
+      if (!parsed) continue; // skip .processing and other non-chat files
+      const serial = parseInt(parsed[1], 10);
+      const role = parsed[2].toLowerCase();
       const filePath = path.join(chatsDir, name);
       const text = fs.readFileSync(filePath, 'utf-8');
       const stat = fs.statSync(filePath);
@@ -975,23 +993,44 @@ export function createExampleBoardServerRuntime(options = {}) {
 
   // Fire-and-forget invocation of .chat-handler after a user chat message is persisted.
   // boardDir/.chat-handler must contain the handler command as a single-line string.
-  // Called with: --boardId <id> --cardId <id> --extra <json>
-  // extra: { chatDir: <abs path>, boardDir: <abs path>, lastChatFile: <filename> }
+  // Called with: --boardId <id> --cardId <id> --extraEncJson <base64json>
+  // extraEncJson decodes to:
+  //   boardSetupRoot  — absolute path to board root (parent of runtime/, surface/, runtime-out/)
+  //   boardRuntimeDir — relative: 'runtime'
+  //   runtimeStatusDir— relative: 'runtime-out'
+  //   cardsDir        — relative: 'surface/tmp-cards'
+  //   chatDir         — relative (from cardsDir): e.g. 'card-portfolio/chats'
+  //   lastChatFile    — filename of the just-written user message, e.g. '001_user.txt'
   // Handler failures are logged and silently ignored — chat-send response is never affected.
   function invokeChatHandler(cardId, chatsDir, lastChatFile) {
     const handlerFile = path.join(boardDir, '.chat-handler');
     if (!fs.existsSync(handlerFile)) return;
     const handlerCmd = fs.readFileSync(handlerFile, 'utf-8').trim();
     if (!handlerCmd) return;
-    const extra = Buffer.from(JSON.stringify({ chatDir: chatsDir, boardDir, lastChatFile })).toString('base64');
+    const boardSetupRoot = path.dirname(boardDir);
+    const processingFile = path.join(chatsDir, '.processing');
+    try { fs.mkdirSync(chatsDir, { recursive: true }); fs.writeFileSync(processingFile, '', 'utf-8'); } catch {}
+    const extra = Buffer.from(JSON.stringify({
+      boardSetupRoot,
+      boardRuntimeDir:  path.relative(boardSetupRoot, boardDir),
+      runtimeStatusDir: path.relative(boardSetupRoot, runtimeOutDir),
+      cardsDir:         path.relative(boardSetupRoot, tmpCardsDir),
+      chatDir:          chatsDir,
+      lastChatFile,
+    })).toString('base64');
     try {
-      const proc = spawn(handlerCmd, ['--boardId', boardId, '--cardId', String(cardId), '--extraEncJson', extra], {
+      const proc = spawn(handlerCmd, [
+        '--boardId', boardId, '--cardId', String(cardId),
+        '--extraEncJson', extra,
+        '--cleanOnExit', processingFile,
+      ], {
         shell: true,
         stdio: 'ignore',
       });
       proc.unref();
       console.log(`[chat-handler] invoked for card "${cardId}" (boardId: "${boardId}")`);
     } catch (err) {
+      try { fs.unlinkSync(processingFile); } catch {}
       console.warn(`[chat-handler] spawn failed for card "${cardId}":`, (err && err.message) || String(err));
     }
   }

package/browser/live-cards.js

@@ -64,12 +64,16 @@ var LiveCard = (function () {
       .lc-staged-file { display:flex; align-items:center; gap:.5rem; padding:.125rem 0; }
       .lc-chat-el { display:flex; flex-direction:column; }
       .lc-chat-body { flex:1; overflow-y:auto; max-height:300px; padding:.25rem; }
-      .lc-chat-bubble { padding:.5rem .75rem; margin:.375rem 0; border-radius:.75rem; max-width:85%; word-wrap:break-word; font-size:.875rem; line-height:1.4; }
-      .lc-chat-bubble-user { background:var(--bs-primary-bg-subtle,#cfe2ff); margin-left:auto; }
-      .lc-chat-bubble-assistant { background:var(--bs-light,#f8f9fa); }
-      .lc-chat-bubble-system { background:transparent; color:var(--bs-secondary,#6c757d); font-style:italic; text-align:center; max-width:100%; font-size:.8rem; }
+      .lc-chat-bubble { padding:.5rem .75rem; margin:.375rem 0; border-radius:.75rem; max-width:85%; word-wrap:break-word; font-size:.875rem; line-height:1.4; display:flex; gap:.5rem; align-items:flex-start; }
+      .lc-chat-bubble-user { background:var(--bs-primary-bg-subtle,#cfe2ff); margin-left:auto; flex-direction:row-reverse; }
+      .lc-chat-bubble-assistant { background:var(--bs-light,#f8f9fa); border:1px solid var(--bs-border-color,#dee2e6); }
+      .lc-chat-bubble-system { background:transparent; color:var(--bs-secondary,#6c757d); font-style:italic; text-align:center; max-width:100%; font-size:.8rem; align-self:center; gap:0; padding:.125rem .5rem; }
+      .lc-chat-icon { flex-shrink:0; line-height:1.4; opacity:.6; display:flex; align-items:center; margin-top:.15rem; }
+      .lc-chat-bubble-content { flex:1; min-width:0; }
+      .lc-chat-bubble-content p:last-child { margin-bottom:0; }
       .lc-chat-bubble-pending { opacity:.85; }
       .lc-chat-bubble-pending .spinner-border { width:.75rem; height:.75rem; margin-left:.4rem; border-width:.12em; vertical-align:middle; }
+      .lc-chat-processing { display:flex; align-items:center; gap:.5rem; padding:.375rem .75rem; color:var(--bs-secondary,#6c757d); font-size:.8rem; font-style:italic; }
       .lc-chat-input-bar { display:flex; gap:.25rem; align-items:center; }
       .lc-chat-modal-input-row { display:flex; align-items:center; gap:.375rem; }
       .lc-chat-modal-input-row .form-control { min-width:0; }
@@ -403,25 +407,46 @@ var LiveCard = (function () {
     function _appendModalChatMessage(role, text, files) {
       _ensureChatModal();
       if (!_chatModal.body) return;
+      if (!text && !files) return; // skip empty messages
 
-      const bubble = document.createElement('div');
       const normalizedRole = role === 'user' || role === 'assistant' ? role : 'system';
       const roleClass = normalizedRole === 'user'
         ? 'lc-chat-bubble-user'
         : (normalizedRole === 'assistant' ? 'lc-chat-bubble-assistant' : 'lc-chat-bubble-system');
+
+      const bubble = document.createElement('div');
       bubble.className = 'lc-chat-bubble ' + roleClass;
-      bubble.textContent = text || '';
+
+      if (normalizedRole !== 'system') {
+        // SVG icons: person for user, sparkle-star for assistant
+        const userSvg = '<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="8" r="4"/><path d="M4 20c0-4 3.6-7 8-7s8 3 8 7"/></svg>';
+        const asstSvg = '<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"/></svg>';
+        const iconEl = document.createElement('span');
+        iconEl.className = 'lc-chat-icon';
+        iconEl.setAttribute('aria-hidden', 'true');
+        iconEl.innerHTML = normalizedRole === 'user' ? userSvg : asstSvg;
+        bubble.appendChild(iconEl);
+      }
+
+      const content = document.createElement('div');
+      content.className = 'lc-chat-bubble-content';
+      if (normalizedRole === 'assistant') {
+        content.innerHTML = _renderMd(text || '');
+      } else {
+        content.textContent = text || '';
+      }
 
       if (Array.isArray(files) && files.length) {
         const meta = document.createElement('div');
-        meta.className = 'lc-chat-inline-meta';
-        meta.textContent = files.map(function (f) {
+        meta.className = 'small mt-1 text-muted';
+        meta.textContent = '\uD83D\uDCCE ' + files.map(function (f) {
           if (!f) return 'file';
           return typeof f === 'string' ? f : (f.name || 'file');
         }).join(', ');
-        bubble.appendChild(meta);
+        content.appendChild(meta);
       }
 
+      bubble.appendChild(content);
       _chatModal.body.appendChild(bubble);
       _chatModal.body.scrollTop = _chatModal.body.scrollHeight;
     }
@@ -471,9 +496,29 @@ var LiveCard = (function () {
       _chatModal.body.innerHTML = '';
       if (!normalized.length) {
         _chatModal.body.innerHTML = '<div class="text-muted small">No messages yet.</div>';
+        _syncProcessingBar(nodeId);
         return;
       }
       normalized.forEach(function (m) { _appendModalChatMessage(m.role, m.text, m.files); });
+      _syncProcessingBar(nodeId);
+    }
+
+    function _syncProcessingBar(nodeId) {
+      if (!_chatModal.body) return;
+      const node = nodeId ? cfg.resolve(nodeId) : null;
+      const isProcessing = !!(node && node.card_data && node.card_data.__chat_signal && node.card_data.__chat_signal.processing);
+      let ind = _chatModal.body.querySelector('.lc-chat-processing');
+      if (isProcessing) {
+        if (!ind) {
+          ind = document.createElement('div');
+          ind.className = 'lc-chat-processing';
+          ind.innerHTML = '<span class="spinner-border spinner-border-sm" role="status" aria-label="AI working"></span><span>\u2728 AI working\u2026</span>';
+          _chatModal.body.appendChild(ind);
+        }
+        _chatModal.body.scrollTop = _chatModal.body.scrollHeight;
+      } else {
+        if (ind) ind.remove();
+      }
     }
 
     async function openChatModal(nodeId) {
@@ -2130,6 +2175,7 @@ var LiveCard = (function () {
       const nodeId = _chatModal.currentNodeId;
       if (!nodeId || !_chatModal.backdrop || !_chatModal.backdrop.classList.contains('lc-open')) return;
       _clearPendingModalChatMessages();
+      _syncProcessingBar(nodeId);
       _refreshModalChatHistory(nodeId).catch(function () {});
     }
 

package/dist/cli/board-live-cards-cli.cjs

@@ -1459,7 +1459,7 @@ function nextEntryAfterFetchFailure(entry, reason) {
   return next;
 }
 function runtimePath(boardDir, cardId) {
-  return path__namespace.join(boardDir, `${cardId}.runtime.json`);
+  return path__namespace.join(boardDir, cardId, "runtime.json");
 }
 function readRuntimeState(boardDir, cardId) {
   const p = runtimePath(boardDir, cardId);
@@ -1471,7 +1471,9 @@ function readRuntimeState(boardDir, cardId) {
   }
 }
 function writeRuntimeState(boardDir, cardId, state) {
-  fs__namespace.writeFileSync(runtimePath(boardDir, cardId), JSON.stringify(state, null, 2));
+  const p = runtimePath(boardDir, cardId);
+  fs__namespace.mkdirSync(path__namespace.dirname(p), { recursive: true });
+  fs__namespace.writeFileSync(p, JSON.stringify(state, null, 2));
 }
 function appendEventToJournal(boardDir, event) {
   const journalPath = path__namespace.join(boardDir, JOURNAL_FILE);
@@ -1798,7 +1800,7 @@ function createBoardReactiveGraph(boardDir) {
       const sourcesData = {};
       for (const src of allSources) {
         if (src.outputFile) {
-          const filePath = path__namespace.join(boardDir, src.outputFile);
+          const filePath = path__namespace.join(boardDir, cardId, src.outputFile);
           if (fs__namespace.existsSync(filePath)) {
             const raw = fs__namespace.readFileSync(filePath, "utf-8").trim();
             try {
@@ -2329,10 +2331,10 @@ function cmdSourceDataFetched(args) {
     process.exit(1);
   }
   const { cbk, rg, cid, b, d, cs } = payload;
-  const destPath = path__namespace.join(rg, d);
+  const destPath = path__namespace.join(rg, cid, d);
   fs__namespace.mkdirSync(path__namespace.dirname(destPath), { recursive: true });
   fs__namespace.renameSync(tmpFile, destPath);
-  console.log(`[source-data-fetched] ${cid}.${b} \u2192 ${d}`);
+  console.log(`[source-data-fetched] ${cid}.${b} \u2192 ${cid}/${d}`);
   const fetchedAt = (/* @__PURE__ */ new Date()).toISOString();
   const cbkDecoded = decodeCallbackToken2(cbk);
   if (!cbkDecoded) {
@@ -2664,7 +2666,7 @@ function cmdInferenceDone(args) {
     inferenceCompletedAt
   };
   fs__namespace.writeFileSync(cardPath, JSON.stringify(card, null, 2), "utf-8");
-  const runtimePath2 = path__namespace.join(dir, `${taskName}.runtime.json`);
+  const runtimePath2 = path__namespace.join(dir, taskName, "runtime.json");
   let runtime = { _sources: {} };
   if (fs__namespace.existsSync(runtimePath2)) {
     try {
@@ -2674,6 +2676,7 @@ function cmdInferenceDone(args) {
   }
   const inferenceEntry = runtime._inferenceEntry ?? {};
   runtime._inferenceEntry = nextEntryAfterFetchDelivery(inferenceEntry, inferenceCompletedAt);
+  fs__namespace.mkdirSync(path__namespace.dirname(runtimePath2), { recursive: true });
   fs__namespace.writeFileSync(runtimePath2, JSON.stringify(runtime, null, 2), "utf-8");
   appendEventToJournal(dir, {
     type: "task-progress",