fraim 2.0.137 → 2.0.138

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

@@ -251,14 +251,14 @@ function buildStartPlan(hostId, message) {
     if (hostId === 'codex') {
         return {
             command: executableName('codex'),
-            args: ['exec', '--json', '--skip-git-repo-check', '--dangerously-bypass-approvals-and-sandbox'],
+            args: ['exec', '--json', '--skip-git-repo-check', '--dangerously-bypass-approvals-and-sandbox', '--model', 'gpt-4o'],
             stdin: message,
         };
     }
     if (hostId === 'gemini') {
         return {
             command: executableName('gemini'),
-            args: ['--yolo'],
+            args: ['--yolo', '--skip-trust'],
             stdin: message,
         };
     }
@@ -272,7 +272,7 @@ function buildContinuePlan(hostId, sessionId, message) {
     if (hostId === 'codex') {
         return {
             command: executableName('codex'),
-            args: ['exec', 'resume', '--json', '--skip-git-repo-check', '--dangerously-bypass-approvals-and-sandbox', sessionId],
+            args: ['exec', 'resume', '--json', '--skip-git-repo-check', '--dangerously-bypass-approvals-and-sandbox', '--model', 'gpt-4o', sessionId],
             stdin: message,
         };
     }
@@ -281,7 +281,7 @@ function buildContinuePlan(hostId, sessionId, message) {
         // is sent as a fresh invocation. The Hub still tracks state client-side.
         return {
             command: executableName('gemini'),
-            args: ['--yolo'],
+            args: ['--yolo', '--skip-trust'],
             stdin: message,
         };
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fraim",
-  "version": "2.0.137",
+  "version": "2.0.138",
   "description": "FRAIM CLI - Framework for Rigor-based AI Management (alias for fraim-framework)",
   "main": "index.js",
   "bin": {

package/public/ai-hub/index.html

@@ -96,7 +96,13 @@
           <div class="messages" id="messages"></div>
 
           <div class="coach">
-            <div class="section-title">Coach the employee</div>
+            <div class="coach-title-row">
+              <span class="section-title">Coach the employee</span>
+              <span class="active-employee-row">
+                <label for="active-employee-select" class="active-employee-label">via</label>
+                <select id="active-employee-select" class="employee-select inline"></select>
+              </span>
+            </div>
             <textarea id="coach-text" placeholder="Tell the employee what to do next…"></textarea>
             <div class="coach-actions">
               <!-- Issue #347 R2: template picker. Hidden when the project
@@ -138,6 +144,7 @@
           <span class="left" id="job-pick-status">Choose a job to continue</span>
           <div class="right">
             <button class="ghost" type="button" id="cancel1">Cancel</button>
+            <button class="ghost" type="button" id="freeform-btn">Just describe what you need</button>
             <button class="send-button" type="button" id="next1" disabled>Next →</button>
           </div>
         </div>

package/public/ai-hub/script.js

@@ -40,7 +40,8 @@ function gatherElements() {
     'cancel1', 'next1', 'back2', 'start',
     'job-search', 'job-catalog', 'job-pick-status',
     'picked-name', 'picked-desc', 'instructions',
-    'employee-select', 'agent-install-panel',
+    'employee-select', 'agent-install-panel', 'active-employee-select',
+    'freeform-btn',
     // Issue #347 additions: tracker, template picker, totals.
     'tracker', 'tracker-rows', 'tracker-note',
     'template-picker-btn', 'template-popover',
@@ -349,6 +350,9 @@ function renderActive() {
   // Coaching state — only enable Send when there's text and the run is resumable.
   syncSendButton();
 
+  // Render the active employee selector in the coach section.
+  renderActiveEmployeeSelect(conv);
+
   // Issue #347 — tracker, totals, picker. The data lives on conv.run
   // (latest server snapshot folded into the conversation by
   // foldRunIntoConversation); for runs that have not yet polled we
@@ -360,6 +364,31 @@ function renderActive() {
   document.title = conv.title ? conv.title : 'AI Hub';
 }
 
+// Render the inline employee selector shown in the coach section of an
+// active conversation. Allows switching agents without reopening the modal.
+function renderActiveEmployeeSelect(conv) {
+  const sel = els['active-employee-select'];
+  if (!sel) return;
+  const employees = state.bootstrap?.employees || [];
+  if (employees.length === 0) { sel.hidden = true; return; }
+  sel.hidden = false;
+  // Only rebuild the options when the employee list changes (avoid reset on every poll).
+  const newKey = employees.map((e) => `${e.id}:${e.available}`).join('|');
+  if (sel.dataset.optionsKey !== newKey) {
+    sel.innerHTML = '';
+    for (const emp of employees) {
+      const opt = document.createElement('option');
+      opt.value = emp.id;
+      opt.textContent = emp.label + (emp.available ? '' : ' (unavailable)');
+      if (!emp.available) opt.disabled = true;
+      sel.appendChild(opt);
+    }
+    sel.dataset.optionsKey = newKey;
+  }
+  const current = (conv && conv.employeeId) || state.selectedEmployeeId || 'claude';
+  if (sel.value !== current) sel.value = current;
+}
+
 // Issue #347 R1 — render the pizza tracker. Reads conv.run.stages and
 // conv.run.currentPhase from the most recent backend snapshot. Hidden
 // when the active job has no declared phases.
@@ -1088,6 +1117,7 @@ const FRAIM_INVOCATION_SYMBOL = {
 };
 
 function fraimInvocationFor(employeeId, jobId, kind) {
+  if (jobId === '__freeform__') return null;
   const symbol = FRAIM_INVOCATION_SYMBOL[employeeId] || '/fraim';
   if (kind === 'start') {
     return `${symbol} ${jobId}`;
@@ -1098,11 +1128,14 @@ function fraimInvocationFor(employeeId, jobId, kind) {
 // Wrap the manager's typed instructions with the host-appropriate FRAIM
 // invocation. The wrapped text is what we ACTUALLY send to the host CLI
 // AND what we show in the timeline so the manager sees what the agent
-// received.
+// received. For freeform jobs (no FRAIM job assigned), the instructions
+// are sent verbatim with no invocation prefix.
 function buildAgentMessage(employeeId, jobId, kind, instructions, stubPath) {
+  const trimmed = (instructions || '').trim();
   const invocation = fraimInvocationFor(employeeId, jobId, kind);
+  // Freeform: no FRAIM prefix, no stub reference — just the raw instructions.
+  if (!invocation) return trimmed;
   const stub = (kind === 'start' && stubPath) ? `\n[Job stub: ${stubPath}]` : '';
-  const trimmed = (instructions || '').trim();
   if (!trimmed) return `${invocation}${stub}`;
   // For continue turns, applyTemplateInvocation already writes the full
   // FRAIM invocation (e.g. "/fraim follow-your-mentor") into the textarea.
@@ -1118,14 +1151,16 @@ async function startRun(job, instructions, employeeId) {
   // Prefix the manager's typed instructions with the FRAIM invocation so
   // the underlying host actually launches the right job. The prefixed
   // text is what the host receives AND what we show in the timeline.
-  const absoluteStubPath = (job.stubPath && state.projectPath)
+  // Freeform jobs carry no job stub and no FRAIM invocation prefix.
+  const isFreeform = job.id === '__freeform__';
+  const absoluteStubPath = (!isFreeform && job.stubPath && state.projectPath)
     ? [state.projectPath, job.stubPath].join('/').replace(/\\/g, '/').replace(/\/+/g, '/')
-    : job.stubPath;
+    : undefined;
   const agentMessage = buildAgentMessage(employeeId, job.id, 'start', instructions, absoluteStubPath);
   const conv = {
     id: newConversationId(),
     projectPath: state.projectPath,
-    title: deriveTitle(job.title, instructions),
+    title: isFreeform ? deriveTitle('', instructions) : deriveTitle(job.title, instructions),
     jobId: job.id,
     jobTitle: job.title,
     employeeId,
@@ -1170,6 +1205,43 @@ async function startRun(job, instructions, employeeId) {
   }
 }
 
+// Start a NEW run on an existing conversation with a different agent.
+// The conversation's message history stays intact; only the run restarts.
+async function restartConvWithAgent(conv, newAgentId, text) {
+  const agentMessage = buildAgentMessage(newAgentId, conv.jobId, 'start', text);
+  conv.status = 'running';
+  conv.sessionId = null;
+  conv.messages.push({ role: 'manager', text: agentMessage, at: Date.now() });
+  upsertConversation(conv);
+  renderRail();
+  renderActive();
+  try {
+    const run = await requestJson('/api/ai-hub/runs', {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({
+        projectPath: state.projectPath,
+        hostId: newAgentId,
+        jobId: conv.jobId,
+        message: agentMessage,
+      }),
+    });
+    conv.runId = run.id;
+    foldRunIntoConversation(conv, run);
+    upsertConversation(conv);
+    renderRail();
+    renderActive();
+    startPolling();
+  } catch (error) {
+    conv.status = 'failed';
+    conv.events.push({ channel: 'system', text: error.message });
+    upsertConversation(conv);
+    renderRail();
+    renderActive();
+    showStatus(error.message, true);
+  }
+}
+
 async function continueRun(text) {
   const conv = activeConversation();
   if (!conv || !conv.runId) return;
@@ -1320,6 +1392,31 @@ async function pickProject() {
   }
 }
 
+// Show step 2 of the new-job modal. Handles both regular jobs and freeform.
+function showStep2(job) {
+  const isFreeform = job.id === '__freeform__';
+  const assignedJobDiv = document.querySelector('#step2 .assigned-job');
+  if (assignedJobDiv) assignedJobDiv.hidden = isFreeform;
+  const h = document.querySelector('#step2 .modal-header h2');
+  const p = document.querySelector('#step2 .modal-header p');
+  if (isFreeform) {
+    if (h) h.textContent = 'What do you need done?';
+    if (p) p.textContent = 'Describe the task in plain language. No FRAIM job required.';
+    els['instructions'].placeholder = 'Describe what you need…';
+  } else {
+    if (h) h.textContent = 'Tell the employee what you need';
+    if (p) p.textContent = 'A few sentences is enough. The employee will ask if anything is unclear.';
+    els['instructions'].placeholder = 'What outcome do you want? Any context the employee should know?';
+    els['picked-name'].textContent = job.title;
+    els['picked-desc'].textContent = job.intent || '';
+  }
+  els['instructions'].value = '';
+  els['start'].disabled = true;
+  els['step1'].hidden = true;
+  els['step2'].hidden = false;
+  setTimeout(() => els['instructions'].focus(), 50);
+}
+
 // ---------------------------------------------------------------------------
 // Wire up
 // ---------------------------------------------------------------------------
@@ -1334,14 +1431,15 @@ function wireEvents() {
   });
   els['next1'].addEventListener('click', () => {
     if (!state.selectedJob) return;
-    els['picked-name'].textContent = state.selectedJob.title;
-    els['picked-desc'].textContent = state.selectedJob.intent || '';
-    els['instructions'].value = '';
-    els['start'].disabled = true;
-    els['step1'].hidden = true;
-    els['step2'].hidden = false;
-    setTimeout(() => els['instructions'].focus(), 50);
+    showStep2(state.selectedJob);
   });
+
+  if (els['freeform-btn']) {
+    els['freeform-btn'].addEventListener('click', () => {
+      state.selectedJob = { id: '__freeform__', title: 'Freeform task', intent: '' };
+      showStep2(state.selectedJob);
+    });
+  }
   els['instructions'].addEventListener('input', () => {
     els['start'].disabled = els['instructions'].value.trim().length === 0;
   });
@@ -1365,9 +1463,32 @@ function wireEvents() {
     if (!text) return;
     els['coach-text'].value = '';
     syncSendButton();
-    await continueRun(text);
+    // If the user changed the agent via the inline selector, restart with the
+    // new agent (new run) instead of continuing on the old one. This lets them
+    // recover from a failed run by switching agents without opening the modal.
+    const conv = activeConversation();
+    const chosenAgent = els['active-employee-select'] && els['active-employee-select'].value;
+    if (conv && chosenAgent && chosenAgent !== conv.employeeId && conv.status !== 'running') {
+      conv.employeeId = chosenAgent;
+      state.selectedEmployeeId = chosenAgent;
+      await restartConvWithAgent(conv, chosenAgent, text);
+    } else {
+      await continueRun(text);
+    }
   });
 
+  if (els['active-employee-select']) {
+    els['active-employee-select'].addEventListener('change', () => {
+      const conv = activeConversation();
+      const newAgent = els['active-employee-select'].value;
+      state.selectedEmployeeId = newAgent;
+      if (conv) {
+        conv.employeeId = newAgent;
+        persistConversations();
+      }
+    });
+  }
+
   // Issue #347 R2 — template picker.
   if (els['template-picker-btn']) {
     els['template-picker-btn'].addEventListener('click', (e) => {

package/public/ai-hub/styles.css

@@ -315,6 +315,28 @@ button { font: inherit; cursor: pointer; }
   margin-bottom: 8px;
 }
 
+.coach-title-row {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 8px;
+}
+.coach-title-row .section-title { margin-bottom: 0; }
+.active-employee-row {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+}
+.active-employee-label {
+  font-size: 12px;
+  color: var(--muted);
+}
+.employee-select.inline {
+  font-size: 12px;
+  padding: 3px 8px;
+  border-radius: 6px;
+}
+
 /* Progress is now a single-line status strip (was a tall card) so the
    messages region gets the vertical space it needs. */
 .progress {