memstack-skill-loader 4.0.5__tar.gz → 4.0.7__tar.gz

{memstack_skill_loader-4.0.5/src/memstack_skill_loader.egg-info → memstack_skill_loader-4.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: memstack-skill-loader
-Version: 4.0.5
+Version: 4.0.7
 Summary: MCP server that vector-indexes MemStack Pro skills for on-demand loading
 Requires-Python: >=3.10
 Requires-Dist: mcp>=1.0.0

{memstack_skill_loader-4.0.5 → memstack_skill_loader-4.0.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "memstack-skill-loader"
-version = "4.0.5"
+version = "4.0.7"
 description = "MCP server that vector-indexes MemStack Pro skills for on-demand loading"
 requires-python = ">=3.10"
 dependencies = [

{memstack_skill_loader-4.0.5 → memstack_skill_loader-4.0.7}/src/memstack_skill_loader/__init__.py

@@ -1,3 +1,3 @@
 """MemStack Skill Loader — MCP server for semantic skill search."""
 
-__version__ = "4.0.5"
+__version__ = "4.0.7"

{memstack_skill_loader-4.0.5 → memstack_skill_loader-4.0.7}/src/memstack_skill_loader/agent_runner.py

@@ -66,7 +66,8 @@ SYSTEM_PROMPTS = {
         "external stylesheet.\n"
         "- Never hardcode secrets, API keys, tokens, passwords, or credentials in source code. "
         "Always use environment variables loaded from .env files. If a secret is needed, create "
-        "or update a .env.example file with the variable name and a placeholder value."
+        "or update a .env.example file with the variable name and a placeholder value.\n"
+        "- Do NOT run git add, git commit, or any git commands. Only make file changes."
     ),
     "reviewer": (
         "You are a Reviewer agent. You review the Builder's changes against the original "
@@ -189,6 +190,24 @@ def _extract_task_text(raw: str) -> str:
     return result[:72]
 
 
+def _clean_task_description(task: str) -> str:
+    """Strip Working directory/Branch boilerplate, returning the user's task description."""
+    import re
+    _BOILERPLATE_LINE = re.compile(
+        r'^(working\s+directory:|branch:|read\s+all\s+files\s+before\s+modifying\.?)',
+        re.IGNORECASE
+    )
+    lines = task.splitlines()
+    start = 0
+    for i, line in enumerate(lines):
+        stripped = line.strip()
+        if not stripped or _BOILERPLATE_LINE.match(stripped):
+            start = i + 1
+        else:
+            break
+    return "\n".join(lines[start:]).strip()
+
+
 def _extract_commit_from_reviewer(reviewer_output: str) -> str:
     """Extract a commit-friendly summary from the reviewer's APPROVED message."""
     import re
@@ -333,6 +352,7 @@ def _extract_text_from_stream_line(line: str) -> Optional[str]:
 def _invoke_api_agent(name: str, prompt: str, system_prompt: str,
                       log_path: Optional[Path] = None, timeout: int = 600,
                       model: str = "", session_id: Optional[str] = None,
+                      working_dir: str = "",
                       ) -> tuple[str, int, int]:
     """Call the Anthropic Messages API directly via httpx.
 
@@ -410,7 +430,7 @@ def _invoke_api_agent(name: str, prompt: str, system_prompt: str,
 
     try:
         log_agent_invocation(
-            name, len(prompt), len(output), session_id, "",
+            name, len(prompt), len(output), session_id, working_dir,
             input_tokens=input_tokens, output_tokens=output_tokens, cost_usd=0.0,
         )
     except Exception:
@@ -645,6 +665,7 @@ class Session:
             meta = {
                 "session_id": self.session_id,
                 "task": self.task,
+                "task_description": _clean_task_description(self.task),
                 "status": self.status,
                 "started_at": self.started_at,
                 "iteration": self.iteration,
@@ -727,6 +748,7 @@ def _orchestrate(session: Session) -> None:
                 timeout=min(600, session.timeout),
                 model=session.models.get("manager", ""),
                 session_id=session.session_id,
+                working_dir=session.working_dir,
             )
         except subprocess.TimeoutExpired:
             session.agents["manager"]["status"] = "timeout"
@@ -855,6 +877,7 @@ def _orchestrate(session: Session) -> None:
                     timeout=session.timeout,
                     model=session.models.get("reviewer", ""),
                     session_id=session.session_id,
+                    working_dir=session.working_dir,
                 )
             except subprocess.TimeoutExpired:
                 session.agents["reviewer"]["status"] = "timeout"

{memstack_skill_loader-4.0.5 → memstack_skill_loader-4.0.7}/src/memstack_skill_loader/dashboard.html

@@ -686,6 +686,8 @@
     color: #484f58;
     font-size: 0.85rem;
   }
+  .stat-green, .card .value.stat-green { color: #3fb950; }
+  .stat-orange, .card .value.stat-orange { color: #f0883e; }
   .session-row {
     display: flex;
     align-items: center;
@@ -1401,7 +1403,7 @@
   <div class="page-header" style="display:flex;align-items:flex-start;justify-content:space-between;flex-wrap:wrap;gap:0.5rem">
     <div>
       <h2>Burn Report</h2>
-      <p class="meta">Token usage &amp; cost analytics &middot; Anthropic Opus pricing ($15/M in, $75/M out)</p>
+      <p class="meta">Token usage &amp; cost analytics &middot; Opus ($15/$75 per M) &middot; Sonnet ($3/$15 per M)</p>
     </div>
     <div style="display:flex;align-items:center;gap:0.6rem">
       <div class="burn-period-toggle">
@@ -1508,7 +1510,6 @@
           <input id="agent-workdir-input" type="text" placeholder="C:\\Projects\\my-app" style="flex:1;background:#0d1117;border:1px solid #30363d;border-radius:6px;color:#e6edf3;padding:0.6rem 0.7rem;font-size:0.88rem;font-family:monospace;">
           <button onclick="openDirBrowser()" style="background:#21262d;color:#8b949e;border:1px solid #30363d;padding:0.6rem 0.9rem;border-radius:6px;cursor:pointer;font-size:0.82rem;font-weight:600;white-space:nowrap;transition:background 0.2s,color 0.2s;" onmouseenter="this.style.background='#30363d';this.style.color='#e6edf3'" onmouseleave="this.style.background='#21262d';this.style.color='#8b949e'">Browse</button>
         </div>
-        <div id="recent-projects-dropdown" style="margin-bottom:1rem;max-height:140px;overflow-y:auto;border:1px solid #30363d;border-radius:6px;background:#0d1117;display:none;"></div>
         <label style="display:block;font-size:0.82rem;color:#8b949e;margin-bottom:0.4rem;font-weight:600;">Additional Context (optional)</label>
         <textarea id="agent-context-input" rows="3" placeholder="Optional. Examples:&#10;- This project uses Flask, not FastAPI&#10;- Don't touch files in the /api directory&#10;- Follow existing code style, no type hints&#10;- The database is SQLite, not Postgres" style="width:100%;background:#0d1117;border:1px solid #30363d;border-radius:6px;color:#e6edf3;padding:0.7rem;font-size:0.88rem;resize:vertical;font-family:inherit;margin:0 0 0.8rem 0;"></textarea>
         <div style="display:flex;align-items:center;gap:1rem;margin-bottom:0.8rem;">
@@ -2710,6 +2711,7 @@ async function saveDiary() {
       b.textContent = 'Diary Saved!';
       b.disabled = true;
     }
+    localStorage.setItem('memstack-diary-saved-session', currentAgentSessionId);
     if (summary) _renderDiarySummary(summary);
   }
   function _diaryFail(b, msg) {
@@ -2776,6 +2778,7 @@ async function saveDiaryCompleted() {
     btn.classList.add('saved');
     btn.textContent = 'Diary Saved!';
     btn.disabled = true;
+    localStorage.setItem('memstack-diary-saved-session', currentAgentSessionId);
     if (summary) _renderDiarySummary(summary);
   }
   function _completedDiaryFail(msg) {
@@ -2885,17 +2888,38 @@ async function resetAgentUI() {
   document.getElementById('agent-completed').style.display = 'none';
   document.getElementById('agent-commit-msg').value = '';
   document.getElementById('agent-git-output').style.display = 'none';
+  // Clear task and context inputs
+  document.getElementById('agent-task-input').value = '';
   document.getElementById('agent-context-input').value = '';
+  // Reset timeout to default
+  document.getElementById('agent-timeout-input').value = '60';
+  // Collapse Model Selection and MCP Tools
+  const modelDetails = document.querySelector('.model-selection-details');
+  if (modelDetails) modelDetails.removeAttribute('open');
+  const mcpDetails = document.getElementById('mcp-tools-details');
+  if (mcpDetails) mcpDetails.removeAttribute('open');
+  // Uncheck auto-commit
+  const autoCommit = document.getElementById('agent-autocommit-checkbox');
+  if (autoCommit) autoCommit.checked = false;
+  // Reset git buttons
   for (const [id, label] of [['agent-commit-btn', 'Commit'], ['agent-push-btn', 'Push'], ['agent-commit-push-btn', 'Commit & Push']]) {
     const b = document.getElementById(id);
     b.textContent = label; b.disabled = false; b.style.cursor = 'pointer'; b.style.opacity = '1'; b.style.background = '';
   }
   lastGitOutput = '';
   lastGitSuccess = true;
+  // Reset diary summary card
   const dsCard = document.getElementById('diary-summary-card');
   if (dsCard) { dsCard.style.display = 'none'; dsCard.innerHTML = ''; }
-  document.getElementById('agent-workdir-input').value = '';
-  loadLastWorkdir();
+  // Reset both diary buttons back to default
+  for (const btnId of ['header-diary-btn', 'completed-diary-btn']) {
+    const b = document.getElementById(btnId);
+    if (b) { b.textContent = 'Save Diary'; b.classList.remove('saving', 'saved', 'save-failed'); b.disabled = false; }
+  }
+  // Restore working directory from localStorage (user likely wants same project)
+  const cachedWd = localStorage.getItem('memstack-last-workdir');
+  const wdInput = document.getElementById('agent-workdir-input');
+  if (cachedWd) { wdInput.value = cachedWd; fetchMcpServers(cachedWd); }
 }
 
 async function startAgentTask() {
@@ -2921,6 +2945,7 @@ async function startAgentTask() {
     body.user_name = userProfile.user_name || '';
     const blockedMcp = getBlockedMcpServers();
     if (blockedMcp.length) body.blocked_mcp_servers = blockedMcp;
+    if (workDir) localStorage.setItem('memstack-last-workdir', workDir);
     const res = await fetch('/api/agent-run', {method:'POST', headers: AUTH_HEADERS, body: JSON.stringify(body)});
     const data = await res.json();
     if (data.error) { alert(data.error); return; }
@@ -2966,7 +2991,6 @@ async function loadAgentMonitor() {
     wdInput.addEventListener('blur', () => fetchMcpServers(wdInput.value.trim()));
   }
   fetchAgentStatus();
-  loadRecentProjects();
   loadLastWorkdir();
   loadModelPrefs();
   if (!agentRefreshInterval) {
@@ -2980,8 +3004,21 @@ async function loadLastWorkdir() {
     if (input.value.trim()) return;
     const res = await fetch('/api/last-workdir', {headers: {'X-Auth-Token': AUTH_TOKEN}});
     const data = await res.json();
-    if (data.path) { input.value = data.path; fetchMcpServers(data.path); }
-  } catch(e) { /* ignore */ }
+    if (data.path) {
+      input.value = data.path;
+      localStorage.setItem('memstack-last-workdir', data.path);
+      fetchMcpServers(data.path);
+    } else {
+      const cached = localStorage.getItem('memstack-last-workdir');
+      if (cached) { input.value = cached; fetchMcpServers(cached); }
+    }
+  } catch(e) {
+    const cached = localStorage.getItem('memstack-last-workdir');
+    if (cached) {
+      const input = document.getElementById('agent-workdir-input');
+      if (!input.value.trim()) { input.value = cached; fetchMcpServers(cached); }
+    }
+  }
 }
 
 /* ─── Builder MCP Tools ─── */
@@ -3128,13 +3165,8 @@ async function agentGitPush() {
   try {
     const res = await fetch('/api/agent/push', {method: 'POST', headers: AUTH_HEADERS, body: '{}'});
     const data = await res.json();
-    if (data.status === 'error') {
-      lastGitOutput = data.message || 'Push failed.';
-      lastGitSuccess = false;
-    } else {
-      lastGitOutput = 'Pushed!';
-      lastGitSuccess = true;
-    }
+    lastGitOutput = data.output || data.error || data.message || 'Done';
+    lastGitSuccess = !!data.success;
     outputEl.textContent = lastGitOutput;
     outputEl.style.color = lastGitSuccess ? '#3fb950' : '#f85149';
     if (lastGitSuccess) _btnSuccess(btn, 'Pushed!');
@@ -3152,27 +3184,12 @@ async function agentGitCommitAndPush() {
   const btn = document.getElementById('agent-commit-push-btn');
   const outputEl = document.getElementById('agent-git-output');
   outputEl.style.display = 'block';
-  outputEl.textContent = 'Committing...';
+  outputEl.textContent = 'Committing & pushing...';
   try {
-    const commitRes = await fetch('/api/agent-commit', {method: 'POST', headers: AUTH_HEADERS, body: JSON.stringify({message: msg})});
-    const commitData = await commitRes.json();
-    if (!commitData.success && !(commitData.output || '').toLowerCase().includes('nothing to commit')) {
-      lastGitOutput = commitData.output || commitData.error || 'Commit failed.';
-      lastGitSuccess = false;
-      outputEl.textContent = lastGitOutput;
-      outputEl.style.color = '#f85149';
-      return;
-    }
-    outputEl.textContent = 'Pushing...';
-    const pushRes = await fetch('/api/agent/push', {method: 'POST', headers: AUTH_HEADERS, body: '{}'});
-    const pushData = await pushRes.json();
-    if (pushData.status === 'error') {
-      lastGitOutput = pushData.message || 'Push failed.';
-      lastGitSuccess = false;
-    } else {
-      lastGitOutput = 'Committed & pushed!';
-      lastGitSuccess = true;
-    }
+    const res = await fetch('/api/agent-commit-push', {method: 'POST', headers: AUTH_HEADERS, body: JSON.stringify({message: msg})});
+    const data = await res.json();
+    lastGitOutput = data.output || data.error || 'Done';
+    lastGitSuccess = !!data.success;
     outputEl.textContent = lastGitOutput;
     outputEl.style.color = lastGitSuccess ? '#3fb950' : '#f85149';
     if (lastGitSuccess) _btnSuccess(btn, 'Committed & Pushed!');
@@ -3184,19 +3201,6 @@ async function agentGitCommitAndPush() {
   }
 }
 
-async function loadRecentProjects() {
-  try {
-    const res = await fetch('/api/recent-projects', {headers: AUTH_GET});
-    const dirs = await res.json();
-    const dropdown = document.getElementById('recent-projects-dropdown');
-    if (!dirs.length) { dropdown.style.display = 'none'; return; }
-    dropdown.style.display = 'block';
-    dropdown.innerHTML = dirs.map(d =>
-      `<div style="padding:0.4rem 0.7rem;cursor:pointer;font-size:0.8rem;font-family:monospace;color:#8b949e;border-bottom:1px solid #21262d;transition:background 0.15s;" onmouseenter="this.style.background='#161b22';this.style.color='#e6edf3'" onmouseleave="this.style.background='';this.style.color='#8b949e'" onclick="document.getElementById('agent-workdir-input').value=this.textContent;fetchMcpServers(this.textContent)">${escapeHtml(d)}</div>`
-    ).join('');
-  } catch(e) { /* ignore */ }
-}
-
 /* ─── Directory Browser ─── */
 let dirBrowserCurrentPath = '';
 
@@ -3340,6 +3344,25 @@ function renderAgentUI(data) {
           }, 1000);
         }
       }
+      // Auto-save diary on task completion
+      const _diaryAlreadySaved = currentAgentSessionId && localStorage.getItem('memstack-diary-saved-session') === currentAgentSessionId;
+      if (_diaryAlreadySaved) {
+        setTimeout(() => {
+          const cBtn = document.getElementById('completed-diary-btn');
+          if (cBtn) {
+            cBtn.classList.add('saved');
+            cBtn.textContent = 'Diary Saved!';
+            cBtn.disabled = true;
+          }
+        }, 50);
+      } else {
+        setTimeout(() => {
+          const cBtn = document.getElementById('completed-diary-btn');
+          if (cBtn && cBtn.textContent === 'Save Diary') {
+            saveDiaryCompleted();
+          }
+        }, 500);
+      }
     }
     launcher.style.display = 'none';
     active.style.display = 'none';
@@ -3386,8 +3409,19 @@ function renderAgentUI(data) {
     document.getElementById('agent-token-summary').innerHTML = '<h4>Token Usage</h4>' + tokenRows;
     const commitInput = document.getElementById('agent-commit-msg');
     if (commitInput && !commitInput.value) {
-      const summary = data.commit_summary || '';
-      commitInput.value = 'agent: ' + (summary || 'dashboard updates').substring(0, 72);
+      const taskDesc = data.task || '';
+      const prefix = /fix|bug|error/i.test(taskDesc) ? 'fix' : 'feat';
+      let sourceText = (data.result || '').trim();
+      sourceText = sourceText.replace(/approved after \d+ iteration\(s\):?\s*/gi, '').trim();
+      sourceText = sourceText.replace(/approved:\s*/gi, '').trim();
+      if (!sourceText) sourceText = taskDesc;
+      let summary = sourceText.split(/\.\s+|\.$|\n/)[0].trim() || 'dashboard updates';
+      if (summary.length > 72) {
+        const cut = summary.substring(0, 72);
+        const sp = cut.lastIndexOf(' ');
+        summary = sp > 0 ? cut.substring(0, sp) : cut;
+      }
+      commitInput.value = 'agent: ' + prefix + ': ' + summary;
       autoResize(commitInput);
     }
     const commitBtn = document.getElementById('agent-commit-btn');
@@ -3487,7 +3521,7 @@ function renderAgentUI(data) {
     const barColor = pct < 0 ? '' : pct <= 50 ? 'context-bar-green' : pct <= 77 ? 'context-bar-yellow' : 'context-bar-red';
     const contextHtml = pct < 0
       ? '<div class="context-bar-container">Context: unknown</div>'
-      : '<div class="context-bar-container">' + tokens.toLocaleString() + ' / 200,000 tokens (' + pct + '%)<div class="context-bar"><div class="context-bar-fill ' + barColor + '" style="width:' + pct + '%"></div></div></div>';
+      : '<div class="context-bar-container">' + tokens.toLocaleString() + ' / 200,000 - Context Window: ' + pct + '%<div class="context-bar"><div class="context-bar-fill ' + barColor + '" style="width:' + pct + '%"></div></div></div>';
     if (pct >= 65 && !diaryAutoSaved[role] && tokens > 0) {
       const anyStarted = roleOrder.some(r => {
         const ag = agents[r] || {};
@@ -3864,15 +3898,15 @@ async function loadHeadroomStats(burnData) {
   const el = document.getElementById('headroom-cards');
   const lifetimeEl = document.getElementById('headroom-lifetime');
 
-  const saved = (burnData && burnData.tokens_saved) || 0;
-  const pct = (burnData && burnData.savings_pct) || 0;
-  const costSaved = (burnData && burnData.cost_saved) || 0;
-  const reqs = (burnData && burnData.compress_count) || 0;
+  const opusTokens = (burnData && burnData.opus_tokens) || 0;
+  const opusCost = (burnData && burnData.opus_cost) || 0;
+  const sonnetTokens = (burnData && burnData.sonnet_tokens) || 0;
+  const sonnetCost = (burnData && burnData.sonnet_cost) || 0;
   el.innerHTML = `
-    <div class="card"><div class="value" style="color:#3fb950">${fmt(saved)}</div><div class="label">Tokens Saved</div></div>
-    <div class="card"><div class="value" style="color:#3fb950">${pct.toFixed(2)}%</div><div class="label">Savings Rate</div></div>
-    <div class="card"><div class="value" style="color:#3fb950">$${costSaved.toFixed(2)}</div><div class="label">Cost Saved</div></div>
-    <div class="card"><div class="value" style="color:#58a6ff">${fmt(reqs)}</div><div class="label">Compressions</div></div>
+    <div class="card"><div class="value stat-green">${fmt(opusTokens)}</div><div class="label">Opus Tokens</div></div>
+    <div class="card"><div class="value stat-orange">$${opusCost.toFixed(2)}</div><div class="label">Opus Cost</div></div>
+    <div class="card"><div class="value stat-green">${fmt(sonnetTokens)}</div><div class="label">Sonnet Tokens</div></div>
+    <div class="card"><div class="value stat-orange">$${sonnetCost.toFixed(2)}</div><div class="label">Sonnet Cost</div></div>
   `;
 
   // Show Headroom lifetime stats as a subtle info line when available

{memstack_skill_loader-4.0.5 → memstack_skill_loader-4.0.7}/src/memstack_skill_loader/dashboard.py

@@ -740,7 +740,7 @@ class _Handler(BaseHTTPRequestHandler):
                     _LAST_WORKDIR_FILE.write_text(working_dir, encoding="utf-8")
                 except OSError:
                     pass
-                auto_commit = data.get("auto_commit", True)
+                auto_commit = data.get("auto_commit", False)
                 timeout_minutes = int(data.get("timeout_minutes", 60))
                 manager_model = data.get("manager_model", "")
                 builder_model = data.get("builder_model", "")
@@ -987,7 +987,7 @@ class _Handler(BaseHTTPRequestHandler):
                 status = agent_runner.get_status()
                 work_dir = status.get("working_dir", "")
                 if not work_dir or not Path(work_dir).is_dir():
-                    body = json.dumps({"status": "error", "message": "No valid working directory from last session."}).encode()
+                    body = json.dumps({"success": False, "error": "No valid working directory from last session."}).encode()
                     self._respond(400, "application/json", body)
                     return
 
@@ -998,34 +998,60 @@ class _Handler(BaseHTTPRequestHandler):
 
                 status_r = subprocess.run(["git", "status", "--porcelain"], capture_output=True, text=True, cwd=work_dir, timeout=30)
                 if status_r.stdout.strip():
-                    body = json.dumps({"status": "error", "message": "Uncommitted changes. Commit first."}).encode()
+                    body = json.dumps({"success": False, "error": "Uncommitted changes. Commit first."}).encode()
                     self._respond(200, "application/json", body)
                     return
 
+                output_parts = []
+                ok, out = _run_git_p(["branch", "--show-current"], work_dir)
+                current_branch = out.split("\n", 1)[-1].strip() if ok else ""
+                output_parts.append(out)
+                if not ok or not current_branch:
+                    body = json.dumps({"success": False, "error": "Could not detect current branch", "output": "\n".join(output_parts)}).encode()
+                    self._respond(500, "application/json", body)
+                    return
+
+                default_branch = None
+                for candidate in ("main", "master"):
+                    chk, _ = _run_git_p(["rev-parse", "--verify", candidate], work_dir)
+                    if chk:
+                        default_branch = candidate
+                        break
+
                 try:
-                    steps = [
-                        (["checkout", "master"], 30),
-                        (["merge", "dev", "--ff-only"], 30),
-                        (["push", "origin", "master"], 60),
-                        (["checkout", "dev"], 30),
-                        (["reset", "--hard", "master"], 30),
-                    ]
-                    for args, t in steps:
-                        ok, out = _run_git_p(args, work_dir, timeout=t)
+                    if default_branch and current_branch != default_branch:
+                        steps = [
+                            (["checkout", default_branch], 30),
+                            (["merge", current_branch, "--ff-only"], 30),
+                            (["push", "origin", default_branch], 60),
+                            (["checkout", current_branch], 30),
+                            (["reset", "--hard", default_branch], 30),
+                        ]
+                        for args, t in steps:
+                            ok, out = _run_git_p(args, work_dir, timeout=t)
+                            output_parts.append(out)
+                            if not ok:
+                                body = json.dumps({"success": False, "error": f"git {args[0]} failed", "output": "\n".join(output_parts)}).encode()
+                                self._respond(500, "application/json", body)
+                                return
+                    else:
+                        ok, out = _run_git_p(["push", "origin", current_branch], work_dir, timeout=60)
+                        output_parts.append(out)
                         if not ok:
-                            body = json.dumps({"status": "error", "message": f"git {args[0]} failed: {out}"}).encode()
+                            body = json.dumps({"success": False, "error": "git push failed", "output": "\n".join(output_parts)}).encode()
                             self._respond(500, "application/json", body)
                             return
                 finally:
-                    _run_git_p(["checkout", "dev"], work_dir, timeout=30)
+                    if current_branch:
+                        _run_git_p(["checkout", current_branch], work_dir, timeout=30)
 
-                body = json.dumps({"status": "ok", "message": "Pushed to master"}).encode()
+                body = json.dumps({"success": True, "output": "\n\n".join(output_parts)}).encode()
                 self._respond(200, "application/json", body)
             except subprocess.TimeoutExpired:
-                body = json.dumps({"status": "error", "message": "Git command timed out."}).encode()
+                body = json.dumps({"success": False, "error": "Git command timed out."}).encode()
                 self._respond(500, "application/json", body)
             except Exception as exc:
-                body = json.dumps({"status": "error", "message": str(exc)}).encode()
+                body = json.dumps({"success": False, "error": str(exc)}).encode()
                 self._respond(500, "application/json", body)
         elif self.path == "/api/agent-save-diary":
             try:

{memstack_skill_loader-4.0.5 → memstack_skill_loader-4.0.7}/src/memstack_skill_loader/stats.py

@@ -537,10 +537,30 @@ def get_skill_fire_counts() -> dict[str, int]:
 
 OPUS_INPUT_COST = 15.0   # $/M tokens
 OPUS_OUTPUT_COST = 75.0  # $/M tokens
+SONNET_INPUT_COST = 3.0  # $/M tokens
+SONNET_OUTPUT_COST = 15.0  # $/M tokens
 AVG_OUTPUT_RATIO = 0.3   # assume ~30% of tokens are output
 
 _SESSIONS_DIR = Path.home() / ".memstack" / "agent-runner" / "sessions"
 
+_TASK_BOILERPLATE = re.compile(
+    r'^(working\s+directory:|branch:|read\s+all\s+files\s+before\s+modifying\.?)',
+    re.IGNORECASE
+)
+
+
+def _clean_task_description(task: str) -> str:
+    """Strip Working directory/Branch boilerplate, returning the user's task description."""
+    lines = task.splitlines()
+    start = 0
+    for i, line in enumerate(lines):
+        stripped = line.strip()
+        if not stripped or _TASK_BOILERPLATE.match(stripped):
+            start = i + 1
+        else:
+            break
+    return "\n".join(lines[start:]).strip()
+
 
 def get_recent_agent_sessions(limit: int = 10) -> list[dict]:
     """Scan agent-runner session directories for recent sessions."""
@@ -560,7 +580,7 @@ def get_recent_agent_sessions(limit: int = 10) -> list[dict]:
                 mtime = meta_file.stat().st_mtime
                 entries.append((mtime, {
                     "session_id": meta.get("session_id", d.name),
-                    "task": (meta.get("task") or "")[:60],
+                    "task": (_clean_task_description(meta.get("task_description") or meta.get("task") or ""))[:60],
                     "status": meta.get("status", "unknown"),
                     "started_at": meta.get("started_at", ""),
                     "iteration": meta.get("iteration", 0),
@@ -893,6 +913,38 @@ def get_burn_report_data(period: str = "daily", range_filter: str = "all") -> di
     except Exception:
         pass
 
+    # ── Model-level breakdown (Opus = manager+reviewer, Sonnet = builder) ──
+    opus_input = 0
+    opus_output = 0
+    sonnet_input = 0
+    sonnet_output = 0
+    try:
+        conn = _get_conn()
+        try:
+            row = conn.execute(
+                "SELECT SUM(input_tokens), SUM(output_tokens) FROM skill_fires "
+                "WHERE skill_name IN ('agent:manager', 'agent:reviewer') AND timestamp >= ?",
+                (since,),
+            ).fetchone()
+            opus_input = int(row[0] or 0)
+            opus_output = int(row[1] or 0)
+            row2 = conn.execute(
+                "SELECT SUM(input_tokens), SUM(output_tokens) FROM skill_fires "
+                "WHERE skill_name = 'agent:builder' AND timestamp >= ?",
+                (since,),
+            ).fetchone()
+            sonnet_input = int(row2[0] or 0)
+            sonnet_output = int(row2[1] or 0)
+        finally:
+            conn.close()
+    except Exception:
+        pass
+
+    opus_tokens = opus_input + opus_output
+    sonnet_tokens = sonnet_input + sonnet_output
+    opus_cost = round(opus_input / 1_000_000 * OPUS_INPUT_COST + opus_output / 1_000_000 * OPUS_OUTPUT_COST, 4)
+    sonnet_cost = round(sonnet_input / 1_000_000 * SONNET_INPUT_COST + sonnet_output / 1_000_000 * SONNET_OUTPUT_COST, 4)
+
     return {
         "period": period,
         "range": range_filter,
@@ -907,6 +959,10 @@ def get_burn_report_data(period: str = "daily", range_filter: str = "all") -> di
         "trend": trend,
         "per_skill": per_skill[:20],
         "recent_sessions": recent_sessions,
+        "opus_tokens": opus_tokens,
+        "opus_cost": opus_cost,
+        "sonnet_tokens": sonnet_tokens,
+        "sonnet_cost": sonnet_cost,
     }
 
 

{memstack_skill_loader-4.0.5 → memstack_skill_loader-4.0.7/src/memstack_skill_loader.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: memstack-skill-loader
-Version: 4.0.5
+Version: 4.0.7
 Summary: MCP server that vector-indexes MemStack Pro skills for on-demand loading
 Requires-Python: >=3.10
 Requires-Dist: mcp>=1.0.0