fraim-hub 2.0.233 → 2.0.235

package/dist/src/ai-hub/server.js

@@ -1960,7 +1960,7 @@ class AiHubServer {
                 },
             };
         }
-        if (existing.jobId && existing.jobId !== options.jobId) {
+        if (existing.jobId && existing.jobId !== '__freeform__' && existing.jobId !== options.jobId) {
             console.warn('[ai-hub] hub.conversation_continuity.rejected', {
                 conversationId,
                 existingJobId: existing.jobId,
@@ -1978,6 +1978,15 @@ class AiHubServer {
         }
         return { ok: true, continuityDecision: 'same_continuity' };
     }
+    resolveImplicitResumeConversation(options) {
+        const candidates = this.conversationStore.loadProject(options.projectPath).conversations.filter((conversation) => {
+            if (conversation.jobId !== options.jobId)
+                return false;
+            const existingAgentId = this.configuredAgentIdForConversation(conversation, options.employees);
+            return existingAgentId === options.requestedAgent.id;
+        });
+        return candidates.length === 1 ? candidates[0] : null;
+    }
     isTrustedHubOrigin(req) {
         const origin = req.get('origin');
         if (!origin)
@@ -4061,13 +4070,18 @@ class AiHubServer {
                     throw new Error('A jobId is required to resume.');
                 if (!instructions)
                     throw new Error('Provide an instruction to continue.');
-                const { hostId, agent: configuredAgent, launchContext } = this.resolveLaunchAgent(body.configuredAgentId, requestedHostId);
-                const conversationId = typeof body.conversationId === 'string' && body.conversationId.trim()
+                const employees = this.hostRuntime.detectEmployees();
+                const { hostId, agent: configuredAgent, launchContext } = this.resolveLaunchAgent(body.configuredAgentId, requestedHostId, employees);
+                const requestedConversationId = typeof body.conversationId === 'string' && body.conversationId.trim()
                     ? body.conversationId.trim()
                     : undefined;
-                const persistedConversation = conversationId
-                    ? this.conversationStore.loadProject(projectPath).conversations.find((entry) => entry.id === conversationId)
-                    : undefined;
+                const inferredConversation = requestedConversationId
+                    ? null
+                    : this.resolveImplicitResumeConversation({ projectPath, jobId, requestedAgent: configuredAgent, employees });
+                const conversationId = requestedConversationId || inferredConversation?.id;
+                const persistedConversation = requestedConversationId
+                    ? this.conversationStore.loadProject(projectPath).conversations.find((entry) => entry.id === requestedConversationId)
+                    : inferredConversation ?? undefined;
                 const persistedRun = readPersistedRunProjection(persistedConversation);
                 const now = new Date().toISOString();
                 const run = {
@@ -4078,12 +4092,16 @@ class AiHubServer {
                     jobId, hostId, configuredAgentId: configuredAgent.id, configuredAgentLabel: configuredAgent.label, baseHostId: configuredAgent.baseHostId, projectPath, status: 'running', sessionId,
                     createdAt: now, updatedAt: now, messages: [],
                     events: [(0, hosts_1.createHubEvent)('system', `Resuming ${configuredAgent.label} (${hostId}) session ${sessionId} in ${projectPath}`)],
-                    currentPhase: persistedRun?.currentPhase || null,
-                    phaseHistory: persistedRun?.phaseHistory || [],
+                    // Only carry phase state forward when the prior run was interrupted mid-job
+                    // (status !== 'completed'). A completed conversation is a finished run;
+                    // resuming the session starts a fresh job, so the tracker must be blank.
+                    currentPhase: persistedConversation?.status !== 'completed' ? (persistedRun?.currentPhase || null) : null,
+                    phaseHistory: persistedConversation?.status !== 'completed' ? (persistedRun?.phaseHistory || []) : [],
                     totals: persistedRun?.totals || emptyTotals(),
                     lastStatusChangeAt: now,
-                    runDiscriminant: persistedRun?.runDiscriminant || undefined,
+                    runDiscriminant: persistedConversation?.status !== 'completed' ? (persistedRun?.runDiscriminant || undefined) : undefined,
                     personaKey: getHubPersonaForJob(jobId),
+                    continuityDecision: conversationId ? 'same_continuity' : 'new_conversation',
                 };
                 // Continue-turn message (FRAIM invocation for the job + instructions) plus
                 // the shared-browser note so the resumed agent knows about it.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fraim-hub",
-  "version": "2.0.233",
+  "version": "2.0.235",
   "description": "FRAIM Hub local companion package.",
   "bin": {
     "fraim-hub": "bin/fraim-hub.js"
@@ -158,7 +158,7 @@
     "electron": "^41.2.2",
     "electron-updater": "^6.8.9",
     "express": "^5.2.1",
-    "fraim": "2.0.233",
+    "fraim": "2.0.235",
     "mongodb": "^7.0.0",
     "node-cron": "4.2.1",
     "node-edge-tts": "^1.2.10",

package/public/ai-hub/index.html

@@ -398,7 +398,7 @@
           <div class="conv-topline">
             <div class="employee-identity" id="active-identity"></div>
             <span id="active-title" class="conv-job-title"></span>
-            <button class="conversation-focus-btn" id="conversation-focus-btn" type="button" aria-label="Open focused conversation" title="Open focused conversation">Expand</button>
+            <button class="conversation-focus-btn" id="conversation-focus-btn" type="button" aria-label="Pop-out conversation" title="Pop-out conversation">&#8599;</button>
             <button class="run-stop-btn" id="run-stop-btn" type="button" hidden title="Ask the employee to stop and wait for you">⏹ Stop</button>
             <div class="run-state-pill" id="run-state-pill"></div>
           </div>

package/public/ai-hub/script.js

@@ -1311,6 +1311,19 @@ function stripHubInjectedPromptBlocks(text) {
     .trim();
 }
 
+// Returns a validated http/https URL string suitable for use in an href, or null if unsafe.
+function _safeHref(raw) {
+  try {
+    const url = new URL(raw);
+    return (url.protocol === 'https:' || url.protocol === 'http:') ? url.href : null;
+  } catch (_) { return null; }
+}
+
+// Escape & and " in a URL for safe insertion into an href="..." attribute.
+function _escapeHref(href) {
+  return href.replace(/&/g, '&').replace(/"/g, '"');
+}
+
 // R8: render markdown subset safely. HTML is escaped first.
 function formatEmployeeText(text) {
   if (!text) return '';
@@ -1326,6 +1339,27 @@ function formatEmployeeText(text) {
   s = s.replace(/```[\w]*\n?([\s\S]*?)```/g, (_, code) => `<pre><code>${code.trimEnd()}</code></pre>`);
   // 3. Inline code (single backtick, non-greedy, no newlines).
   s = s.replace(/`([^`\n]+)`/g, '<code>$1</code>');
+  // 3.5. Markdown links [text](url) — only http/https hrefs allowed; link text is already HTML-escaped.
+  // Empty-text links and non-absolute URLs fall back to plain text.
+  s = s.replace(/\[([^\]]*)\]\(([^)]*)\)/g, (match, linkText, rawUrl) => {
+    const trimmed = linkText.trim();
+    // Empty link text: render as plain text; sentinel prevents step 3.6 auto-linkify.
+    if (!trimmed) return `\x00NOLINK\x00${rawUrl.trim()}\x00ENDNOLINK\x00`;
+    // Reverse HTML entities step 1 introduced inside the URL before structural validation.
+    const decodedUrl = rawUrl.trim().replace(/&amp;/g, '&').replace(/&quot;/g, '"').replace(/&lt;/g, '<').replace(/&gt;/g, '>');
+    const href = _safeHref(decodedUrl);
+    if (!href) return trimmed;
+    return `<a href="${_escapeHref(href)}" target="_blank" rel="noopener noreferrer">${trimmed}</a>`;
+  });
+  // 3.6. Auto-linkify bare https:// / http:// URLs not already inside href="...".
+  // Sentinel prefix prevents double-linkifying empty-text [](url) patterns.
+  s = s.replace(/(?<!href=")(?<!href=')(?<!\x00NOLINK\x00)(https?:\/\/[^\s<>"'\x00]+)/g, (url) => {
+    const href = _safeHref(url);
+    if (!href) return url;
+    return `<a href="${_escapeHref(href)}" target="_blank" rel="noopener noreferrer">${_escapeHref(href)}</a>`;
+  });
+  // Strip sentinels: emit the URL as plain text (no anchor).
+  s = s.replace(/\x00NOLINK\x00(.*?)\x00ENDNOLINK\x00/g, (_, url) => url);
   // 4. Bold (**text**).
   s = s.replace(/\*\*(.+?)\*\*/g, '<strong>$1</strong>');
   // 5–7. Process line by line for lists and paragraphs.

package/public/ai-hub/styles.css

@@ -804,13 +804,19 @@ img.conv-employee-avatar {
 .run-stop-btn:disabled { opacity: .55; cursor: default; }
 .conversation-focus-btn {
   flex-shrink: 0;
-  font-size: 12px;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  width: 32px;
+  height: 32px;
+  font-size: 17px;
   font-weight: 700;
+  line-height: 1;
   color: var(--accent-strong);
   background: var(--accent-soft);
   border: 1px solid color-mix(in srgb, var(--accent) 28%, var(--line));
   border-radius: 8px;
-  padding: 6px 10px;
+  padding: 0;
   cursor: pointer;
 }
 .conversation-focus-btn:hover {
@@ -826,6 +832,7 @@ img.conv-employee-avatar {
 .conv-job-title {
   flex: 1;
   min-width: 0;
+  max-width: 100%;
   font-size: 15px;
   font-weight: 600;
   color: var(--text);
@@ -1669,6 +1676,15 @@ img.coach-employee-avatar { object-fit: cover; border-radius: 4px; }
   border: 1px solid var(--line);
   color: var(--text);
 }
+.message.employee .bubble a {
+  color: var(--accent);
+  text-decoration: underline;
+  text-underline-offset: 2px;
+  word-break: break-all;
+}
+.message.employee .bubble a:hover {
+  color: var(--accent-strong);
+}
 .typing-indicator {
   animation: none;
   justify-items: start;