memstack-skill-loader 4.0.1__tar.gz → 4.0.3__tar.gz

{memstack_skill_loader-4.0.1/src/memstack_skill_loader.egg-info → memstack_skill_loader-4.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: memstack-skill-loader
-Version: 4.0.1
+Version: 4.0.3
 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.1 → memstack_skill_loader-4.0.3}/pyproject.toml

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

{memstack_skill_loader-4.0.1 → memstack_skill_loader-4.0.3}/src/memstack_skill_loader/__init__.py

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

{memstack_skill_loader-4.0.1 → memstack_skill_loader-4.0.3}/src/memstack_skill_loader/agent_runner.py

@@ -295,12 +295,45 @@ def _invoke_agent(name: str, prompt: str, working_dir: str, log_path: Optional[P
     )
     with _lock:
         _current_process = proc
+
+    stdout_chunks: list[str] = []
+    stderr_chunks: list[str] = []
+
+    def _reader(stream: object, dest: list[str]) -> None:
+        try:
+            for line in stream:  # type: ignore[union-attr]
+                dest.append(line)
+        except Exception:
+            pass
+
+    t_out = threading.Thread(target=_reader, args=(proc.stdout, stdout_chunks), daemon=True)
+    t_err = threading.Thread(target=_reader, args=(proc.stderr, stderr_chunks), daemon=True)
+
     try:
-        stdout_data, stderr_data = proc.communicate(input=prompt, timeout=timeout)
-    except subprocess.TimeoutExpired:
-        proc.kill()
-        proc.communicate()
-        raise
+        if proc.stdin:
+            try:
+                proc.stdin.write(prompt)
+                proc.stdin.close()
+            except OSError:
+                pass
+        t_out.start()
+        t_err.start()
+
+        deadline = time.monotonic() + timeout
+        while True:
+            t_out.join(timeout=30)
+            rc = proc.poll()
+            if rc is not None:
+                break
+            if time.monotonic() > deadline:
+                proc.kill()
+                t_out.join(5)
+                t_err.join(5)
+                raise subprocess.TimeoutExpired(cmd, timeout)
+        t_out.join(5)
+        t_err.join(5)
+        stdout_data = "".join(stdout_chunks)
+        stderr_data = "".join(stderr_chunks)
     finally:
         with _lock:
             if _current_process is proc:
@@ -367,9 +400,9 @@ class Session:
         self.started_at = time.strftime("%Y-%m-%d %H:%M:%S")
         self.messages: list[dict] = []
         self.agents: dict[str, dict] = {
-            "manager": {"status": "idle", "input_tokens": 0, "output_tokens": 0, "context_tokens": 0, "last_output": ""},
-            "builder": {"status": "idle", "input_tokens": 0, "output_tokens": 0, "context_tokens": 0, "last_output": ""},
-            "reviewer": {"status": "idle", "input_tokens": 0, "output_tokens": 0, "context_tokens": 0, "last_output": ""},
+            "manager": {"status": "idle", "input_tokens": 0, "output_tokens": 0, "context_tokens": 0, "last_output": "", "started_at": None},
+            "builder": {"status": "idle", "input_tokens": 0, "output_tokens": 0, "context_tokens": 0, "last_output": "", "started_at": None},
+            "reviewer": {"status": "idle", "input_tokens": 0, "output_tokens": 0, "context_tokens": 0, "last_output": "", "started_at": None},
         }
 
     def add_message(self, from_agent: str, to_agent: str, content: str) -> None:
@@ -471,6 +504,7 @@ def _orchestrate(session: Session) -> None:
     try:
         # Step 1: Manager analyzes the task
         session.agents["manager"]["status"] = "busy"
+        session.agents["manager"]["started_at"] = time.strftime("%Y-%m-%dT%H:%M:%S")
         session._save_state()
 
         context = _gather_project_context(session.working_dir)
@@ -480,13 +514,26 @@ def _orchestrate(session: Session) -> None:
             manager_prompt += "\n\nAdditional context from user:\n" + session.context
         if session.user_name:
             manager_prompt = f"The user's name is {session.user_name}.\n\n" + manager_prompt
-        manager_output, m_in, m_out, m_ctx = _invoke_agent(
-            "manager", manager_prompt, session.working_dir,
-            log_path=session_log_dir / "manager.log",
-            skip_permissions=True, session_id=session.session_id,
-            timeout=session.timeout,
-            model=session.models.get("manager", ""),
-        )
+        try:
+            manager_output, m_in, m_out, m_ctx = _invoke_agent(
+                "manager", manager_prompt, session.working_dir,
+                log_path=session_log_dir / "manager.log",
+                skip_permissions=True, session_id=session.session_id,
+                timeout=min(180, session.timeout),
+                model=session.models.get("manager", ""),
+            )
+        except subprocess.TimeoutExpired:
+            session.agents["manager"]["status"] = "timeout"
+            session.status = "error"
+            session.result = "Manager timed out after 3 minutes. Try a simpler task description or break the task into smaller pieces."
+            session._save_state()
+            return
+        except RuntimeError:
+            session.agents["manager"]["status"] = "crashed"
+            session.status = "error"
+            session.result = "Manager agent stopped unexpectedly."
+            session._save_state()
+            return
         session.agents["manager"]["input_tokens"] += m_in
         session.agents["manager"]["output_tokens"] += m_out
         session.agents["manager"]["context_tokens"] = m_ctx
@@ -515,6 +562,7 @@ def _orchestrate(session: Session) -> None:
 
             # Builder
             session.agents["builder"]["status"] = "busy"
+            session.agents["builder"]["started_at"] = time.strftime("%Y-%m-%dT%H:%M:%S")
             session._save_state()
 
             builder_prompt = (
@@ -526,13 +574,26 @@ def _orchestrate(session: Session) -> None:
             )
             if session.user_name:
                 builder_prompt = f"The user's name is {session.user_name}.\n\n" + builder_prompt
-            builder_output, b_in, b_out, b_ctx = _invoke_agent(
-                "builder", builder_prompt, session.working_dir,
-                log_path=session_log_dir / "builder.log",
-                skip_permissions=True, bare=True, session_id=session.session_id,
-                timeout=session.timeout,
-                model=session.models.get("builder", ""),
-            )
+            try:
+                builder_output, b_in, b_out, b_ctx = _invoke_agent(
+                    "builder", builder_prompt, session.working_dir,
+                    log_path=session_log_dir / "builder.log",
+                    skip_permissions=True, bare=True, session_id=session.session_id,
+                    timeout=session.timeout,
+                    model=session.models.get("builder", ""),
+                )
+            except subprocess.TimeoutExpired:
+                session.agents["builder"]["status"] = "timeout"
+                session.status = "error"
+                session.result = "Builder timed out. The task may be too large for a single agent pass."
+                session._save_state()
+                return
+            except RuntimeError:
+                session.agents["builder"]["status"] = "crashed"
+                session.status = "error"
+                session.result = "Builder agent stopped unexpectedly."
+                session._save_state()
+                return
             session.agents["builder"]["input_tokens"] += b_in
             session.agents["builder"]["output_tokens"] += b_out
             session.agents["builder"]["context_tokens"] = b_ctx
@@ -568,6 +629,7 @@ def _orchestrate(session: Session) -> None:
 
             # Reviewer
             session.agents["reviewer"]["status"] = "busy"
+            session.agents["reviewer"]["started_at"] = time.strftime("%Y-%m-%dT%H:%M:%S")
             session._save_state()
 
             reviewer_prompt = (
@@ -575,13 +637,26 @@ def _orchestrate(session: Session) -> None:
                 + f"\n\nOriginal task from user:\n{session.task}"
                 + f"\n\nBuilder output (iteration {iteration}):\n{builder_output}"
             )
-            reviewer_output, r_in, r_out, r_ctx = _invoke_agent(
-                "reviewer", reviewer_prompt, session.working_dir,
-                log_path=session_log_dir / "reviewer.log",
-                bare=True, session_id=session.session_id,
-                timeout=session.timeout,
-                model=session.models.get("reviewer", ""),
-            )
+            try:
+                reviewer_output, r_in, r_out, r_ctx = _invoke_agent(
+                    "reviewer", reviewer_prompt, session.working_dir,
+                    log_path=session_log_dir / "reviewer.log",
+                    bare=True, session_id=session.session_id,
+                    timeout=session.timeout,
+                    model=session.models.get("reviewer", ""),
+                )
+            except subprocess.TimeoutExpired:
+                session.agents["reviewer"]["status"] = "timeout"
+                session.status = "error"
+                session.result = "Reviewer timed out."
+                session._save_state()
+                return
+            except RuntimeError:
+                session.agents["reviewer"]["status"] = "crashed"
+                session.status = "error"
+                session.result = "Reviewer agent stopped unexpectedly."
+                session._save_state()
+                return
             session.agents["reviewer"]["input_tokens"] += r_in
             session.agents["reviewer"]["output_tokens"] += r_out
             session.agents["reviewer"]["context_tokens"] = r_ctx

{memstack_skill_loader-4.0.1 → memstack_skill_loader-4.0.3}/src/memstack_skill_loader/dashboard.html

@@ -1449,7 +1449,7 @@
           <summary class="model-selection-summary">Model Selection</summary>
           <div class="model-selection-grid">
             <div class="model-selection-col">
-              <label class="model-selection-label">Manager</label>
+              <label id="agent-model-label-manager" class="model-selection-label">Manager</label>
               <select id="agent-model-manager" class="model-selection-select">
                 <option value="claude-opus-4-6">claude-opus-4-6</option>
                 <option value="claude-sonnet-4-6">claude-sonnet-4-6</option>
@@ -1457,7 +1457,7 @@
               </select>
             </div>
             <div class="model-selection-col">
-              <label class="model-selection-label">Builder</label>
+              <label id="agent-model-label-builder" class="model-selection-label">Builder</label>
               <select id="agent-model-builder" class="model-selection-select">
                 <option value="claude-opus-4-6">claude-opus-4-6</option>
                 <option value="claude-sonnet-4-6">claude-sonnet-4-6</option>
@@ -1465,7 +1465,7 @@
               </select>
             </div>
             <div class="model-selection-col">
-              <label class="model-selection-label">Reviewer</label>
+              <label id="agent-model-label-reviewer" class="model-selection-label">Reviewer</label>
               <select id="agent-model-reviewer" class="model-selection-select">
                 <option value="claude-opus-4-6">claude-opus-4-6</option>
                 <option value="claude-sonnet-4-6">claude-sonnet-4-6</option>
@@ -2730,7 +2730,8 @@ document.addEventListener('visibilitychange', () => {
 const STATUS_COLORS = {
   idle: '#8b949e', busy: '#58a6ff', done: '#3fb950',
   running: '#3fb950', stopped: '#6e7681', error: '#f85149',
-  starting: '#d2a8ff', completed: '#3fb950'
+  starting: '#d2a8ff', completed: '#3fb950',
+  timeout: '#f0883e', crashed: '#f85149'
 };
 
 const ROLE_NAME_COLORS = {manager: '#d2a8ff', builder: '#58a6ff', reviewer: '#7ee787'};
@@ -2742,6 +2743,7 @@ const BUSY_PHRASES = {
 };
 let busyPhraseIntervals = {};
 let busyPhraseIndices = {manager: 0, builder: 0, reviewer: 0};
+let elapsedIntervals = {};
 
 const MODEL_DEFAULTS = {manager: 'claude-opus-4-6', builder: 'claude-sonnet-4-6', reviewer: 'claude-sonnet-4-6'};
 
@@ -2778,6 +2780,8 @@ async function resetAgentUI() {
   lastGitSuccess = true;
   const dsCard = document.getElementById('diary-summary-card');
   if (dsCard) { dsCard.style.display = 'none'; dsCard.innerHTML = ''; }
+  document.getElementById('agent-workdir-input').value = '';
+  loadLastWorkdir();
 }
 
 async function startAgentTask() {
@@ -2833,6 +2837,12 @@ async function loadAgentMonitor() {
       if (name) opt.textContent = name;
     }
   }
+  for (const role of ['manager', 'builder', 'reviewer']) {
+    const lbl = document.getElementById('agent-model-label-' + role);
+    if (lbl && userProfile.agent_names && userProfile.agent_names[role]) {
+      lbl.textContent = userProfile.agent_names[role];
+    }
+  }
   fetchAgentStatus();
   loadRecentProjects();
   loadLastWorkdir();
@@ -3111,10 +3121,17 @@ function renderAgentUI(data) {
     launcher.style.display = 'none';
     active.style.display = 'none';
     completed.style.display = '';
-    const icon = status === 'completed' ? '&#9989;' : status === 'stopped' ? '&#9209;' : '&#9888;&#65039;';
+    const hasTimeout = Object.values(agents).some(ag => ag.status === 'timeout');
+    const hasCrash = Object.values(agents).some(ag => ag.status === 'crashed');
+    let icon, title;
+    if (status === 'completed') { icon = '&#9989;'; title = 'Task Completed'; }
+    else if (status === 'stopped') { icon = '&#9209;'; title = 'Task Stopped'; }
+    else if (hasTimeout) { icon = '&#9203;'; title = 'Task Timed Out'; }
+    else if (hasCrash) { icon = '&#9888;&#65039;'; title = 'Task Failed'; }
+    else { icon = '&#9888;&#65039;'; title = 'Task Failed'; }
     document.querySelector('#agent-completed div div:first-child').innerHTML = icon;
     const h2 = document.querySelector('#agent-completed h2');
-    if (h2) h2.textContent = status === 'completed' ? 'Task Completed' : status === 'stopped' ? 'Task Stopped' : 'Task Failed';
+    if (h2) h2.textContent = title;
     document.getElementById('agent-result-summary').textContent = status === 'stopped' ? (data.result || 'Task stopped by user') : (data.result || `Session ${status}`);
     const COMPACTION_LIMIT = 200000;
     const COMPACTION_WARN = 155000;
@@ -3218,8 +3235,12 @@ function renderAgentUI(data) {
       const phrase = BUSY_PHRASES[role][busyPhraseIndices[role] % BUSY_PHRASES[role].length];
       const customName = (userProfile.agent_names && userProfile.agent_names[role]) || role.charAt(0).toUpperCase() + role.slice(1);
       statusDisplay = `<span class="agent-status-phrase" id="agent-phrase-${role}"><span class="agent-name-label" style="color:${ROLE_NAME_COLORS[role] || '#e6edf3'}">${escapeHtml(customName)}:</span> ${escapeHtml(phrase)}</span>`;
-    } else if ((a.status === 'done' || a.status === 'completed') && data.started_at) {
-      const startMs = new Date(data.started_at).getTime();
+    } else if (a.status === 'timeout') {
+      statusDisplay = 'Timed out';
+    } else if (a.status === 'crashed') {
+      statusDisplay = 'Crashed';
+    } else if ((a.status === 'done' || a.status === 'completed') && (a.started_at || data.started_at)) {
+      const startMs = new Date(a.started_at || data.started_at).getTime();
       const elapsed = Math.max(0, Math.round((Date.now() - startMs) / 1000));
       const mins = Math.floor(elapsed / 60);
       const secs = elapsed % 60;
@@ -3227,6 +3248,15 @@ function renderAgentUI(data) {
     } else {
       statusDisplay = a.status;
     }
+    let elapsedHtml = '';
+    if (a.status === 'busy' && a.started_at) {
+      const secs = Math.max(0, Math.floor((Date.now() - new Date(a.started_at).getTime()) / 1000));
+      elapsedHtml = `<div class="agent-elapsed" id="agent-elapsed-${role}" style="font-size:0.7rem;color:#8b949e;margin-top:0.3rem;">Running: ${Math.floor(secs/60)}m ${secs%60}s</div>`;
+    } else if ((a.status === 'done' || a.status === 'completed' || a.status === 'timeout' || a.status === 'crashed') && a.started_at) {
+      const secs = Math.max(0, Math.floor((Date.now() - new Date(a.started_at).getTime()) / 1000));
+      const label = a.status === 'timeout' ? 'Timed out after' : a.status === 'crashed' ? 'Crashed after' : 'Completed in';
+      elapsedHtml = `<div style="font-size:0.7rem;color:#8b949e;margin-top:0.3rem;">${label} ${Math.floor(secs/60)}m ${secs%60}s</div>`;
+    }
     const COMPACTION_LIMIT = 200000;
     const tokens = (a.context_tokens || 0);
     const pct = tokens > 0 ? Math.min(100, Math.round(tokens / COMPACTION_LIMIT * 100)) : -1;
@@ -3245,7 +3275,8 @@ function renderAgentUI(data) {
         showToast(role + ' context at ' + pct + '% — diary auto-saved', 'warning', 5000);
       }
     }
-    return `<div class="agent-card${a.status === 'error' ? ' agent-card-error-border' : ''}" style="${pulseStyle}">
+    const errorBorder = (a.status === 'error' || a.status === 'timeout' || a.status === 'crashed') ? ' agent-card-error-border' : '';
+    return `<div class="agent-card${errorBorder}" style="${pulseStyle}">
       <span class="agent-tooltip">${escapeHtml(ROLE_DESCRIPTIONS[role] || '')}</span>
       <div style="display:flex;justify-content:space-between;align-items:center;margin-bottom:0.6rem;">
         <strong style="color:#e6edf3;font-size:0.95rem;">${roleIcon} ${escapeHtml((userProfile.agent_names && userProfile.agent_names[role]) || role.charAt(0).toUpperCase() + role.slice(1))}</strong>
@@ -3254,6 +3285,7 @@ function renderAgentUI(data) {
       <div style="font-size:0.75rem;color:#8b949e;line-height:1.6;">
         <div style="margin-top:0.3rem;color:#c9d1d9;font-size:0.72rem;max-height:3em;overflow:hidden;text-overflow:ellipsis;">${escapeHtml((a.last_output || '').substring(0, 150))}</div>
       </div>
+      ${elapsedHtml}
       ${contextHtml}
     </div>`;
   }).join('');
@@ -3276,6 +3308,18 @@ function renderAgentUI(data) {
       busyPhraseIntervals[role] = null;
       busyPhraseIndices[role] = 0;
     }
+    if (a.status === 'busy' && a.started_at && !elapsedIntervals[role]) {
+      const startMs = new Date(a.started_at).getTime();
+      elapsedIntervals[role] = setInterval(() => {
+        const el = document.getElementById('agent-elapsed-' + role);
+        if (!el) return;
+        const secs = Math.max(0, Math.floor((Date.now() - startMs) / 1000));
+        el.textContent = 'Running: ' + Math.floor(secs / 60) + 'm ' + (secs % 60) + 's';
+      }, 1000);
+    } else if (a.status !== 'busy' && elapsedIntervals[role]) {
+      clearInterval(elapsedIntervals[role]);
+      elapsedIntervals[role] = null;
+    }
   });
 
   renderMessageLog(document.getElementById('agent-messages'), messages);

{memstack_skill_loader-4.0.1 → memstack_skill_loader-4.0.3/src/memstack_skill_loader.egg-info}/PKG-INFO

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