rewritable 0.12.0 → 0.14.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rewritable",
-  "version": "0.12.0",
+  "version": "0.14.0",
   "description": "CLI for re-writeable: emit and import single-file rwa documents.",
   "type": "module",
   "bin": {

package/seeds/rewritable.html

@@ -2322,6 +2322,27 @@ async function renderActionsModePanel(panel) {
   const skillRows = skillAffs.length ? skillAffs.map(a =>
     '<div class="rwa-mode-row"><div><div class="rwa-mode-title">' + escRuntimeHtml(a.name) + '</div><div class="rwa-mode-meta">' + escRuntimeHtml(a.kind || 'skill') + ' · ' + escRuntimeHtml(a.skillId) + '</div></div><button type="button" data-action-skill="' + escRuntimeHtml(a.skillId) + '">Open in Skills</button></div>'
   ).join('') : '<div class="rwa-mode-empty">No installed skills.</div>';
+  // Intelligences (rwa-agent/1 roles) — list + activate/deactivate. Activating offers the role's
+  // recommended model (intelligence/0.2 I-A). A verified role can be activated; unverified cannot.
+  const agentList = (typeof runtimeListAgents === 'function') ? runtimeListAgents() : [];
+  const activeRole = (runtimeAgentActive() || {}).role || null;
+  const advisorSet = (typeof runtimeListAdvisors === 'function') ? runtimeListAdvisors() : [];
+  const advisorFull = advisorSet.length >= 3;
+  const agentRows = agentList.length ? agentList.map(a => {
+    const isActive = a.role === activeRole;
+    const isAdvisor = advisorSet.indexOf(a.role) >= 0;
+    const state = isActive ? 'primary' : (isAdvisor ? 'advisor' : '');
+    const meta = (a.verified ? 'verified' : 'unverified') + (state ? ' · ' + state : '');
+    let btns = '';
+    if (a.verified) {
+      const r = escRuntimeHtml(a.role);
+      if (isActive) btns = '<button type="button" data-agent-off="1">Deactivate</button>';
+      else if (isAdvisor) btns = '<button type="button" data-agent-advoff="' + r + '">Remove advisor</button>';
+      else btns = '<button type="button" data-agent-on="' + r + '">Activate</button>'
+        + (advisorFull ? '<button type="button" disabled title="advisor limit reached">Add advisor</button>' : '<button type="button" data-agent-advon="' + r + '">Add advisor</button>');
+    }
+    return '<div class="rwa-mode-row"><div><div class="rwa-mode-title">' + escRuntimeHtml(a.role) + '</div><div class="rwa-mode-meta">' + escRuntimeHtml('intelligence · ' + meta) + '</div></div>' + btns + '</div>';
+  }).join('') : '<div class="rwa-mode-empty">No intelligences installed.</div>';
   panel.innerHTML = [
     '<div class="rwa-mode-section">',
     '<div class="rwa-mode-kicker">Activity</div>',
@@ -2336,6 +2357,7 @@ async function renderActionsModePanel(panel) {
     '<div class="rwa-mode-section"><div class="rwa-mode-kicker">Recent runs</div>' + histRows + '</div>',
     '<div class="rwa-mode-section"><div class="rwa-mode-kicker">Live affordances</div>' + affRows + '</div>',
     '<div class="rwa-mode-section"><div class="rwa-mode-kicker">Installed skill actions</div>' + skillRows + '</div>',
+    '<div class="rwa-mode-section"><div class="rwa-mode-kicker">Intelligences</div>' + agentRows + '</div>',
   ].join('');
   const undoBtn = panel.querySelector('#rwa-actions-undo');
   if (undoBtn) undoBtn.addEventListener('click', () => runtimeUndo());
@@ -2352,6 +2374,19 @@ async function renderActionsModePanel(panel) {
   panel.querySelectorAll('[data-action-skill]').forEach(btn => {
     btn.addEventListener('click', () => runtimeSetMode('skills'));
   });
+  panel.querySelectorAll('[data-agent-on]').forEach(btn => btn.addEventListener('click', () => {
+    try { runtimeActivateAgent(btn.getAttribute('data-agent-on')); } // setActive + offer recommended model
+    catch (e) { if (typeof setStatus === 'function') setStatus('err', '✗ ' + (e && (e.code || e.message))); }
+    renderActionsModePanel(panel);
+  }));
+  const agentOff = panel.querySelector('[data-agent-off]');
+  if (agentOff) agentOff.addEventListener('click', () => { runtimeSetActiveAgent(null); renderActionsModePanel(panel); });
+  panel.querySelectorAll('[data-agent-advon]').forEach(btn => btn.addEventListener('click', () => {
+    try { runtimeAddAdvisor(btn.getAttribute('data-agent-advon')); } // I-E: layer an advisory lens
+    catch (e) { if (typeof setStatus === 'function') setStatus('err', '✗ ' + (e && (e.code || e.message))); }
+    renderActionsModePanel(panel);
+  }));
+  panel.querySelectorAll('[data-agent-advoff]').forEach(btn => btn.addEventListener('click', () => { runtimeRemoveAdvisor(btn.getAttribute('data-agent-advoff')); renderActionsModePanel(panel); }));
 }
 
 // ─── Agent (rwa-edit/1) ─────────────────────────────────────────────
@@ -5593,11 +5628,26 @@ function getActiveActor() {
 // system_prompt swaps the per-kind FRAMING; the shared SYSTEM_PROMPT_RULES (tool protocol, frozen-
 // zone rules, data-rwa-id) are always appended so editing still works. No agent → the singleton.
 function resolveSystemPrompt() {
+  let base = SYSTEM_PROMPT;
   if (activeAgentRole) {
     const rec = Array.from(installedAgents.values()).find(a => a.role === activeAgentRole && a.verified);
-    if (rec && typeof rec.manifest.system_prompt === 'string') return rec.manifest.system_prompt + '\n' + SYSTEM_PROMPT_RULES;
+    if (rec && typeof rec.manifest.system_prompt === 'string') base = rec.manifest.system_prompt + '\n' + SYSTEM_PROMPT_RULES;
+  }
+  return base + _agAdvisorBlock(); // I-E: append any advisory lenses (secondary; empty → byte-identical)
+}
+// I-E (intelligence/0.2 §6) — blended overlays. The PRIMARY is activeAgentRole (framing/actor/vault,
+// unchanged). advisorRoles add advisory PROSE only — never capabilities, so the vault gate
+// (_agVaultAllowed, keyed on the active record) stays primary-only by construction. Verified-only,
+// ephemeral (never serialized), capped. Block is omitted when empty (single-role prompt unchanged).
+function _agAdvisorBlock() {
+  if (!advisorRoles.size) return '';
+  const lines = [];
+  for (const role of advisorRoles) {
+    if (role === activeAgentRole) continue; // a role is primary XOR advisor, never both
+    const rec = Array.from(installedAgents.values()).find(a => a.role === role && a.verified);
+    if (rec && typeof rec.manifest.system_prompt === 'string') lines.push('- ' + role + ': ' + rec.manifest.system_prompt);
   }
-  return SYSTEM_PROMPT;
+  return lines.length ? '\n\nAdditional advisory lenses (secondary — apply only where they don\'t conflict with the above):\n' + lines.join('\n') : '';
 }
 // I12 — the role-scoped vault gate: exact vault:<ns> membership in the agent's vault_namespace_set
 // (mirrors _skVaultAllowed against the agent record instead of the skill's permissions).
@@ -6812,6 +6862,10 @@ const installedSkills = new Map();
 // starts with no agent active per §12).
 const installedAgents = new Map();
 let activeAgentRole = null;
+// I-E — advisory roles layered atop the primary (in-memory, ephemeral, never serialized — like the
+// active role). Capped for prompt coherence/size. Advisors contribute prose only (see _agAdvisorBlock).
+const advisorRoles = new Set();
+const ADVISOR_CAP = 3;
 // I8 (v0.9 §9) — hook firing state. activeHooks holds skillIds currently executing (re-entrancy
 // guard, Inv 23); _lastHookMode tracks the prior mode for on-mode-change's `previous`; _hookSeq
 // makes rwa_hook_log keys unique within a millisecond.
@@ -7806,6 +7860,19 @@ function runtimeSetActiveAgent(role) {
   if (!rec.verified) throw new RwaEditError('unverified_agent', null, { role });
   activeAgentRole = role;
 }
+// I-E — add/remove an advisory role. Verified-only (its prompt drives modify), not-the-primary,
+// capped. Checks order so unverified/not-found beat the cap. Returns the current advisor list.
+function runtimeAddAdvisor(role) {
+  const rec = Array.from(installedAgents.values()).find(a => a.role === role);
+  if (!rec) throw new RwaEditError('agent_not_found', null, { role });
+  if (!rec.verified) throw new RwaEditError('unverified_agent', null, { role });
+  if (role === activeAgentRole || advisorRoles.has(role)) return Array.from(advisorRoles); // primary / already → no-op
+  if (advisorRoles.size >= ADVISOR_CAP) throw new RwaEditError('advisor_cap_reached', null, { cap: ADVISOR_CAP });
+  advisorRoles.add(role);
+  return Array.from(advisorRoles);
+}
+function runtimeRemoveAdvisor(role) { advisorRoles.delete(role); return Array.from(advisorRoles); }
+function runtimeListAdvisors() { return Array.from(advisorRoles); }
 // §12 — validate + verify + register an agent, then persist the #rwa-agents zone (same discipline as
 // runtimeInstallSkill: rollback the in-memory map on a persist failure). A signed-but-unverified
 // agent registers (verified:false) but can't activate.
@@ -7831,6 +7898,7 @@ async function runtimeUninstallAgent(agentId) {
   if (!prev) return { ok: false, errors: ['not_installed'] };
   installedAgents.delete(agentId);
   if (activeAgentRole && prev.role === activeAgentRole && !Array.from(installedAgents.values()).some(a => a.role === activeAgentRole)) activeAgentRole = null;
+  if (prev.role && !Array.from(installedAgents.values()).some(a => a.role === prev.role)) advisorRoles.delete(prev.role); // I-E: drop a removed role from advisors
   try {
     await runtimeRegionCommit({ regions: [_agAgentsRegion()], actor: 'agent:uninstall', reachability: 'frozen' });
   } catch (e) {
@@ -8083,6 +8151,67 @@ window.__rwaClassifyInstallText = classifyInstallText;
 window.__rwaInstallFromText = routeInstallFromText;
 window.__rwaHandleCarrierDrop = handleCarrierDrop;
 
+// ── intelligence/0.2 I-A (docs/specs/rwa-intelligence-spec.md §6) — recommended model on activation.
+// A carrier may carry a NON-SECRET recommended_model / recommended_backend on its rwa-agent/1
+// ENVELOPE (OUTSIDE the signed `agent`, so canonicalAgent is unchanged and the signature still
+// verifies — this stays seed-only). On activation the runtime OFFERS to apply it to sessionStorage
+// behind a one-line consent: it never auto-applies, never sets a base-URL, never touches the API
+// key. A recommendation is a suggestion, not a stored credential (key/model are sessionStorage-only).
+const REC_MODEL_RE = /^[A-Za-z0-9._:\/-]{1,200}$/; // a model id: provider/name, dots, colon (ollama), hyphen
+const REC_BACKENDS = ['openrouter', 'ollama', 'lmstudio', 'atomic', 'bridge', 'bridge-session'];
+function getRecommendation(envelope) {
+  const e = envelope || {};
+  const out = {};
+  if (typeof e.recommended_model === 'string' && REC_MODEL_RE.test(e.recommended_model.trim())) out.model = e.recommended_model.trim();
+  if (typeof e.recommended_backend === 'string' && REC_BACKENDS.includes(e.recommended_backend.trim())) out.backend = e.recommended_backend.trim();
+  return (out.model || out.backend) ? out : null;
+}
+function applyRecommendation(rec) {
+  const r = rec || {};
+  const applied = {};
+  if (r.model && REC_MODEL_RE.test(String(r.model))) { sessionStorage.setItem(RWA.K_MODEL, String(r.model)); applied.model = String(r.model); }
+  if (r.backend && REC_BACKENDS.includes(String(r.backend))) { sessionStorage.setItem(RWA.K_BACKEND, String(r.backend)); applied.backend = String(r.backend); }
+  try { const m = document.getElementById('rwa-model'); if (m && applied.model) m.value = applied.model; const b = document.getElementById('rwa-backend'); if (b && applied.backend) { b.value = applied.backend; b.dispatchEvent(new Event('change')); } } catch (_) {}
+  return applied;
+}
+// Offer the role's recommended model, if any and if it differs from the current session. Fire-and-
+// forget consent dialog; resolves with the choice. Activation already happened — this only proposes.
+function offerRecommendedModel(role) {
+  const recRec = Array.from(installedAgents.values()).find(a => a.role === role);
+  const rec = recRec && getRecommendation(recRec.envelope);
+  if (!rec) return Promise.resolve({ offered: false });
+  const curModel = sessionStorage.getItem(RWA.K_MODEL) || RWA.MODEL;
+  const curBackend = sessionStorage.getItem(RWA.K_BACKEND) || 'openrouter';
+  if ((!rec.model || rec.model === curModel) && (!rec.backend || rec.backend === curBackend)) return Promise.resolve({ offered: false });
+  return new Promise(resolve => {
+    const prev = document.getElementById('rwa-model-offer'); if (prev) prev.remove();
+    const overlay = document.createElement('div'); overlay.id = 'rwa-model-offer';
+    overlay.style.cssText = 'position:fixed;inset:0;z-index:99999;background:rgba(0,0,0,.45);display:flex;align-items:center;justify-content:center;';
+    const card = document.createElement('div');
+    card.style.cssText = 'background:#fff;max-width:480px;width:92%;border-radius:18px;padding:24px 26px;font:14px/1.5 var(--font-ui,system-ui);box-shadow:0 12px 48px rgba(0,0,0,.28);';
+    const what = [rec.model ? 'model <code>' + _skEsc(rec.model) + '</code>' : '', rec.backend ? 'backend <code>' + _skEsc(rec.backend) + '</code>' : ''].filter(Boolean).join(' on ');
+    card.innerHTML =
+      '<h2 style="margin:0 0 .4em;font-size:1.15rem">Use this intelligence’s recommended ' + (rec.model ? 'model' : 'backend') + '?</h2>' +
+      '<p style="margin:.2em 0;color:#444">The <strong>' + _skEsc(role) + '</strong> role suggests ' + what + ' for ⌘K. This is a <em>recommendation</em> (not part of the signed role) — applying it changes only your session’s model/backend selection. Your API key is untouched.</p>' +
+      '<div style="display:flex;gap:10px;margin-top:1.2em;justify-content:flex-end">' +
+        '<button data-act="keep" style="padding:9px 16px;border:1px solid #ccc;border-radius:10px;background:#fff;cursor:pointer">Keep current</button>' +
+        '<button data-act="apply" style="padding:9px 16px;border:none;border-radius:10px;background:var(--gray-900,#111);color:#fff;cursor:pointer">Use it</button>' +
+      '</div>';
+    overlay.appendChild(card); document.body.appendChild(overlay);
+    const close = (choice) => { overlay.remove(); resolve(choice); };
+    card.querySelector('[data-act=keep]').onclick = () => close({ offered: true, applied: null });
+    card.querySelector('[data-act=apply]').onclick = () => close({ offered: true, applied: applyRecommendation(rec) });
+  });
+}
+// Activate a role AND offer its recommended model — the "on activation" entry the UI calls.
+function runtimeActivateAgent(role) { runtimeSetActiveAgent(role); return offerRecommendedModel(role); }
+window.__rwaGetRecommendation = getRecommendation;
+window.__rwaApplyRecommendation = applyRecommendation;
+window.__rwaOfferRecommendedModel = offerRecommendedModel;
+window.__rwaActivateAgent = runtimeActivateAgent;
+window.__rwaResolveSystemPrompt = resolveSystemPrompt; // I-E test hook — the assembled modify() prompt
+window.__rwaGetActiveActor = getActiveActor;
+
 // §4/§5a — does a network: host pattern admit a host? Mirror of cli/src/skill-manifest.mjs
 // matchNetworkOrigin (keep in step). The bridge's per-call origin check.
 function _skMatchNetworkOrigin(pattern, host) {
@@ -9615,7 +9744,7 @@ document.addEventListener('keydown', e => {
       discoverSkills: runtimeDiscoverSkills, // v0.9 §11 (I6) — GET the marketplace index (opt-in network)
       fetchSkillFromIndex: runtimeFetchSkillFromIndex, // v0.9 §11 (I6) — fetch + client-side-verify an indexed skill
       vault: { get: runtimeVaultGet, set: runtimeVaultSet, has: runtimeVaultHas, namespaces: runtimeVaultNamespaces, unlock: runtimeVaultUnlock, lock: runtimeVaultLock, isLocked: runtimeVaultIsLocked, export: runtimeVaultExport, import: runtimeVaultImport }, // v0.8 §6 + v0.9 §14 (I13) portable export/import
-      agents: { list: runtimeListAgents, active: runtimeAgentActive, setActive: runtimeSetActiveAgent, install: runtimeInstallAgent, uninstall: runtimeUninstallAgent, message: runtimeAgentMessage, showInstallDialog: showAgentInstallDialog }, // v0.9 §12 — multi-agent roles
+      agents: { list: runtimeListAgents, active: runtimeAgentActive, setActive: runtimeSetActiveAgent, activate: runtimeActivateAgent, install: runtimeInstallAgent, uninstall: runtimeUninstallAgent, message: runtimeAgentMessage, showInstallDialog: showAgentInstallDialog, offerModel: offerRecommendedModel, addAdvisor: runtimeAddAdvisor, removeAdvisor: runtimeRemoveAdvisor, advisors: runtimeListAdvisors }, // v0.9 §12 — multi-agent roles; `activate` = setActive + offer recommended model (I-A); addAdvisor/removeAdvisor/advisors = blended overlays (I-E)
       hookLog: runtimeHookLog, // v0.9 §9 — the hook audit trail (rwa_hook_log)
     };
     // `status` is a getter so each read returns a fresh snapshot of