bloby-bot 0.49.1 → 0.49.3

package/supervisor/chat/src/components/Chat/MessageBubble.tsx

@@ -2,7 +2,7 @@ import { useState } from 'react';
 import { Streamdown } from 'streamdown';
 import { code } from '@streamdown/code';
 import 'streamdown/styles.css';
-import { Paperclip, Copy, Check, ExternalLink, Mic, Play, Pause } from 'lucide-react';
+import { Paperclip, Copy, Check, ExternalLink, Mic, Play, Pause, Laptop, Smartphone, Monitor, Globe, Volume2 } from 'lucide-react';
 import AudioBubble from './AudioBubble';
 import EnvForm, { type EnvGroupData, type EnvField } from './EnvForm';
 import BlobyImageCard from './BlobyImageCard';
@@ -29,6 +29,27 @@ function formatTime(iso: string): string {
   }
 }
 
+/** Parse the leading channel tag from content, e.g. "[Mac]\n..." → { tag: "Mac", body: "..." }.
+ *  User messages without an explicit tag default to "Chat" (PWA chat bubble). */
+function parseChannelTag(text: string): { tag: string; body: string } {
+  const m = text.match(/^\[([^\]]+)\]\n([\s\S]*)$/);
+  if (!m) return { tag: 'Chat', body: text };
+  const raw = m[1].split('|')[0].trim();
+  // Normalize explicit [PWA] tag to the friendlier "Chat" label
+  const tag = raw === 'PWA' ? 'Chat' : raw;
+  return { tag, body: m[2] };
+}
+
+function ChannelIcon({ tag }: { tag: string }) {
+  const cls = 'h-3 w-3 opacity-60';
+  if (tag === 'Mac') return <Laptop className={cls} />;
+  if (tag === 'WhatsApp') return <Smartphone className={cls} />;
+  if (tag === 'workspace') return <Monitor className={cls} />;
+  if (tag === 'Chat') return <Globe className={cls} />;
+  if (tag === 'Alexa') return <Volume2 className={cls} />;
+  return <Globe className={cls} />;
+}
+
 /** Convert channel-pair URLs (any format) into markdown links so the buttons render */
 function preprocessContent(text: string): string {
   let out = text;
@@ -172,6 +193,9 @@ export default function MessageBubble({ role, content, timestamp, hasAttachments
   const isUser = role === 'user';
   const time = timestamp ? formatTime(timestamp) : '';
 
+  // Strip channel tag from user messages for clean display
+  const { tag: channelTag, body: displayContent } = isUser ? parseChannelTag(content) : { tag: '', body: content };
+
   // Separate image and document attachments
   const imageAtts = attachments?.filter((a) => a.mediaType?.startsWith('image/')) || [];
   const docAtts = attachments?.filter((a) => !a.mediaType?.startsWith('image/')) || [];
@@ -187,7 +211,7 @@ export default function MessageBubble({ role, content, timestamp, hasAttachments
     return (
       <div className="flex flex-col items-end gap-0.5">
         <div className="group relative max-w-[85%]">
-          <CopyButton text={content} />
+          <CopyButton text={displayContent} />
           <div className="rounded-2xl px-4 py-2.5 text-sm leading-relaxed whitespace-pre-wrap bg-primary text-primary-foreground break-words">
             {/* Image thumbnails */}
             {imageUrls.length > 0 && (
@@ -224,7 +248,7 @@ export default function MessageBubble({ role, content, timestamp, hasAttachments
               </div>
             )}
             {/* Text content */}
-            {content}
+            {displayContent}
             {/* Inline audio bar */}
             {audioData && (
               <div className="mt-2 pt-2 border-t border-white/10">
@@ -233,7 +257,16 @@ export default function MessageBubble({ role, content, timestamp, hasAttachments
             )}
           </div>
         </div>
-        {time && <span className="text-[10px] text-muted-foreground/50 px-1 self-end">{time}</span>}
+        {/* Timestamp + channel icon */}
+        <div className="flex items-center gap-1 px-1 self-end">
+          {channelTag && (
+            <span className="flex items-center gap-0.5 text-[10px] text-muted-foreground/40">
+              <ChannelIcon tag={channelTag} />
+              {channelTag}
+            </span>
+          )}
+          {time && <span className="text-[10px] text-muted-foreground/50">{time}</span>}
+        </div>
       </div>
     );
   }

package/supervisor/chat/src/hooks/useBlobyChat.ts

@@ -270,7 +270,7 @@ export function useBlobyChat(ws: WsClient | null, triggerReload?: number, enable
         ]);
       }),
       // Cross-device sync: append message from another client
-      ws.on('chat:sync', (data: { conversationId: string; message: { role: string; content: string; timestamp: string } }) => {
+      ws.on('chat:sync', (data: { conversationId: string; message: { role: string; content: string; timestamp: string; attachments?: StoredAttachment[] } }) => {
         if (conversationIdRef.current && data.conversationId !== conversationIdRef.current) return;
         setMessages((msgs) => [
           ...msgs,
@@ -279,6 +279,8 @@ export function useBlobyChat(ws: WsClient | null, triggerReload?: number, enable
             role: data.message.role as 'user' | 'assistant',
             content: data.message.content,
             timestamp: data.message.timestamp,
+            hasAttachments: !!(data.message.attachments?.length),
+            attachments: data.message.attachments,
           },
         ]);
       }),

package/supervisor/file-saver.ts

@@ -33,7 +33,7 @@ export function saveAttachment(att: { type: 'image' | 'file'; name: string; medi
   const ext = extFromName || extFromMime[att.mediaType] || 'bin';
 
   const filename = `${stamp}_${rand}.${ext}`;
-  const relPath = `files/${category}/${filename}`;
+  const relPath = `${category}/${filename}`;
 
   const dir = category === 'images' ? paths.filesImages : paths.filesDocuments;
   const absPath = `${dir}/${filename}`;

package/supervisor/index.ts

@@ -2187,10 +2187,17 @@ mint();
                 role: 'user', content, meta,
               });
 
-              // Broadcast user message to other clients
+              // Broadcast user message to other clients (include saved attachment metadata)
               broadcastBlobyExcept(ws, 'chat:sync', {
                 conversationId: convId,
-                message: { role: 'user', content, timestamp: new Date().toISOString() },
+                message: {
+                  role: 'user',
+                  content,
+                  timestamp: new Date().toISOString(),
+                  attachments: savedFiles.length
+                    ? savedFiles.map((f) => ({ type: f.type, name: f.name, mediaType: f.mediaType, filePath: f.relPath }))
+                    : undefined,
+                },
               });
             } catch (err: any) {
               log.warn(`[bloby] DB persist error: ${err.message}`);
@@ -2253,10 +2260,12 @@ mint();
             const ownPhone = waStatus?.connected ? (waStatus.info?.phoneNumber as string | undefined) : undefined;
             const waMirrorTo = ownPhone ? `${ownPhone}@s.whatsapp.net` : undefined;
             log.info(`[orchestrator] Pushing message into live conversation (waMirror=${waMirrorTo || 'none'})`);
+            // Don't prepend [PWA] if content already carries its own channel tag (e.g. [Mac] from Morphy)
+            const alreadyTagged = /^\[[^\]]+\]\n/.test(content);
             channelManager.pushWithRouting(
               convId,
               { surface: 'chat', waSendTo: waMirrorTo, isSelfChat: true },
-              `[chat]\n${content}`,
+              alreadyTagged ? content : `[PWA]\n${content}`,
               data.attachments,
               savedFiles,
             );

package/worker/prompts/bloby-system-prompt.txt

@@ -278,12 +278,13 @@ If your human asks you to update a skill's behavior, edit the files INSIDE `skil
 
 You can communicate through several surfaces at once. The two built-in ones are:
 
-- **`[chat]`** — the chat bubble in the dashboard. This is the main one: the floating Bloby widget your human clicks open, the conversation you're reading right now if no other tag is present. Treat it as your home base.
+- **`[PWA]`** — the chat bubble in the dashboard (web app / PWA). This is the main one: the floating Bloby widget your human clicks open, the conversation you're reading right now if no other tag is present. Treat it as your home base.
+- **`[Mac]`** — the Morphy native Mac app living in the MacBook notch. Your human held a hotkey, spoke, and Morphy sent the transcript here. Screenshots of their screen may be attached. Keep replies concise — they'll be spoken aloud via TTS. No markdown, no bullet lists — plain spoken sentences only.
 - **`[workspace]`** — a chat-shaped widget your human placed somewhere inside their dashboard *workspace*. It mirrors the main chat, but the context is whatever the human (or you) built it into. It could be a magic-mirror panel on a tablet on the wall, a kiosk/DAC by the front door, a desk dashboard, a car-mounted display, a kitchen screen during cooking — anything you've ever helped them assemble on the workspace that has a chat-style entry point. **Check `MEMORY.md` and the workspace files** to learn the actual purpose of the device this message came from: is this the kitchen tablet asking for a recipe? The hallway mirror asking what's on today's schedule? The garage panel asking about the car? Tailor tone, brevity, and content to that role. A magic mirror should get a short ambient answer, not a long technical paragraph. If you don't yet know what the workspace surface is for, ask once and write it to memory so future `[workspace]` turns are grounded.
 
 Beyond those, your human can install additional channels (WhatsApp, Telegram, Discord, Alexa…) as **skills** from the Bloby Marketplace. Each channel skill teaches you the conventions for that surface.
 
-**Channel discipline.** Every incoming message is tagged with a surface (e.g. `[chat]`, `[workspace]`, `[WhatsApp | … | role | name]`, `[Alexa | …]`) — that tag is the truth about who you're talking to and where your reply will go. The supervisor pins each turn's reply to the surface that triggered it; concurrent inbounds from another channel cannot redirect this turn. **Don't infer the channel from prior messages, conversation drift, or what feels right** — read the tag on the current turn and respond accordingly. Chat-bubble content does not belong in a WhatsApp reply, workspace-device context does not belong in a chat-bubble reply, and so on. If a tag isn't present, you're on the chat bubble. If you ever feel the urge to mention a different channel's content in your reply, stop and re-check the tag.
+**Channel discipline.** Every incoming message is tagged with a surface (e.g. `[PWA]`, `[Mac]`, `[workspace]`, `[WhatsApp | … | role | name]`, `[Alexa | …]`) — that tag is the truth about who you're talking to and where your reply will go. The supervisor pins each turn's reply to the surface that triggered it; concurrent inbounds from another channel cannot redirect this turn. **Don't infer the channel from prior messages, conversation drift, or what feels right** — read the tag on the current turn and respond accordingly. If a tag isn't present, you're on the PWA chat bubble. If you ever feel the urge to mention a different channel's content in your reply, stop and re-check the tag.
 
 ## Marketplace — Getting New Skills
 

package/dist-bloby/assets/mermaid-GHXKKRXX-BS0WlgMc.js

@@ -1 +0,0 @@
-import{i as e}from"./bloby-DU3UB3X1.js";export{e as Mermaid};